Imported Translations from Transifex

Change-Id: I2b07b67cc0afbc7aef69e26d64874775e0faf612

diff --git a/neutron/locale/bg_BG/LC_MESSAGES/neutron.po b/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
index 2b6dccd91a4f733f48ed589e4cc0d7100bed7d01..73a08494637986a8715316dd8441f1d8148ecb26 100644 (file)
--- a/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
+++ b/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/cs/LC_MESSAGES/neutron.po b/neutron/locale/cs/LC_MESSAGES/neutron.po
index 36f9425d97959387ea41227040fe81f35177107a..b082c4898b26ef5aec419f01064afdb5ba324f5d 100644 (file)
--- a/neutron/locale/cs/LC_MESSAGES/neutron.po
+++ b/neutron/locale/cs/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/da/LC_MESSAGES/neutron.po b/neutron/locale/da/LC_MESSAGES/neutron.po
index cc4849860479e36f93302cea3a9f770de7c6f206..bdcc10ceb652afdf6a43347f99e6af23a3db69e7 100644 (file)
--- a/neutron/locale/da/LC_MESSAGES/neutron.po
+++ b/neutron/locale/da/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/de/LC_MESSAGES/neutron.po b/neutron/locale/de/LC_MESSAGES/neutron.po
index 4cd75b74c8d6284f2d697ad158b208894b689a0c..be5c55b78ed4a5f4641b6513ca653686811ad2f9 100644 (file)
--- a/neutron/locale/de/LC_MESSAGES/neutron.po
+++ b/neutron/locale/de/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-05-22 08:17+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: German "
@@ -18,177 +18,177 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr "Weder 'X_USER_ID' noch 'X_USER' in Anforderung gefunden"
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr "Bei Kontexterstellung gelöschte Argumente: %s"
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr "'read_deleted' kann nur 'no', 'yes' oder 'only' sein, nicht '%r'"
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
-msgstr "Quantum-'core_plugin' nicht konfiguriert!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
+msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr "Plug-in-Position: %s"
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr "Laden von Plug-in: %s"
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr "Fehler beim Laden von Plug-in"
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
-"Plug-in nicht gefunden. Sie können ein Plug-in mit folgendem Befehl "
-"installieren: pip install <plugin-name>\n"
-"Beispiel: pip install quantum-sample-plugin"
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr "Laden von Service-Plug-ins: %s"
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr "Plug-in nicht gefunden."
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr "Mehrere Plug-ins für Service %s wurden konfiguriert"
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr "%(type)s-Plug-in erfolgreich geladen. Beschreibung: %(desc)s"
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 "Angefordertes Feld: %(field)s kann in Ziel: %(target_dict)s nicht "
 "gefunden werden"
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr "In Quotenfunktionen unterstütze Ressourcennamen"
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr "Standardanzahl an zulässigen Ressourcen pro Nutzer, Minus für unbegrenzt"
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr "Anzahl an zulässigen Netzen pro Nutzer, Minus für unbegrenzt"
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr "Anzahl an zulässigen Teilnetzen pro Nutzer, Minus für unbegrenzt"
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr "Anzahl an zulässigen Ports pro Nutzer, Minus für unbegrenzt"
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr "Standardtreiber zur Verwendung für Quotenprüfungen"
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr "%s ist bereits registriert."
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr "Sekunden zwischen Ausführungen regelmäßiger Tasks"
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
@@ -197,194 +197,198 @@ msgstr ""
 "für regelmäßige Tasks gewartet werden soll, um die Belastung zu "
 "reduzieren. (Inaktivierung durch Festlegen auf 0)"
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
-msgstr "In 'WsgiService.create()'"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
+msgstr ""
+
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr "Keine bekannten API-Anwendungen konfiguriert."
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
-msgstr "Quantum-Service gestartet, empfangsbereit auf %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
+msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr "Ausnahme tritt auf, wenn Zeitgeber stoppt"
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr "Ausnahme tritt beim Warten auf Zeitgeber auf"
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr "Empfangsbereitschaft auf %(host)s:%(port)s nicht möglich"
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr "Inhaltstyp fehlt"
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr "Typ für Daten %(data)s ist %(type)s"
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr "Kann JSON nicht verstehen"
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr "Interne DTD ist nicht zulässig"
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr "Kann XML nicht verstehen"
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr "Nicht erkannter Inhaltstyp in Anforderung angegeben"
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr "Kein Inhaltstyp in Anforderung angegeben"
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr "Leerer Nachrichtentext in Anforderung angegeben"
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 "Deserialisieren von Nachrichtentext als angegebenen Inhaltstyp nicht "
 "möglich "
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr "Sie müssen '__call__' implementieren"
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr "%(method)s %(url)s"
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr "Nicht unterstützter Inhaltstyp"
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr "InvalidContentType: %s"
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr "Fehlerhafter Anforderungshauptteil"
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr "MalformedRequestBody: %s"
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr "Ausgelöste HTTP-Ausnahme: %s"
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr "Interner Fehler"
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr "%(url)s mit HTTP %(status)d zurückgegeben"
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr "%(url)s hat einen Fehler zurückgegeben: %(exception)s"
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr "Daten konnten nicht deserialisiert werden"
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr "Intervall für Resynchronisation."
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr "Der für die Verwaltung des DHCP-Servers verwendete Treiber."
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr "IP-Überschneidung zulassen."
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr "Support-Metadatenanforderungen auf isolierten Netzen."
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
@@ -393,33 +397,33 @@ msgstr ""
 "Der DHCP-Treiber '%s' unterstützt das Abrufen einer Liste mit bestehenden"
 " Netzen nicht"
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr "DHCP-Agent gestartet"
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr "%s bei DHCP nicht möglich."
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr "Lease kann nicht aktualisiert werden"
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr "Synchronisation von Status"
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr "Netzstatus kann nicht synchronisiert werden."
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr "RPC-Informationsaufruf von Netz %s fehlgeschlagen."
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
@@ -428,93 +432,91 @@ msgstr ""
 "%(port_num)d Routerports auf dem Zugangsnetz für Metadaten gefunden. Nur "
 "Port '%(port_id)s' für Router '%(router_id)s' wird berücksichtigt"
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr "Der für die Verwaltung der virtuellen Schnittstelle verwendete Treiber."
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr "Sie müssen einen Schnittstellentreiber angeben"
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr "Fehler beim Importieren von Schnittstellentreiber '%s'"
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr "Wiederverwendung von vorhandenem Gerät: %s."
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr "Position des durch DHCP-Leaserelais erstellten UNIX-Domänensockets"
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr "Netz-ID %s ist keine gültige UUID"
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 "Parsing von Lease-Relais-Nachricht an Verzeichnis kann nicht durchgeführt"
 " werden."
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr "Ausnahmewert: %s"
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr "Nachrichtendarstellung: %s"
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr "Lease kann nicht aktualisiert werden. Ausnahme"
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
-"Der Quantum-Server unterstützt keine Statusberichte. Statusberichte für "
-"diesen Agenten werden inaktiviert."
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr "Erstellung des Statusberichts fehlgeschlagen!"
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "'agent_updated' (Agent aktualisiert) durch Serverseite %s!"
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr "Name der für externen Netzverkehr verwendeten Brücke."
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
-msgstr "Von Quantum-Metadaten-Namensbereichsproxy verwendeter TCP-Port."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
+msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
@@ -523,7 +525,7 @@ msgstr ""
 "Hochverfügbarkeitskonfiguration; setzen Sie den Wert auf kleiner oder "
 "gleich 0, um diese Funktion zu inaktivieren."
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 #, fuzzy
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
@@ -532,415 +534,412 @@ msgstr ""
 "Wenn 'namespaces' inaktiviert ist, kann der Agent der Ebene 3 nur einen "
 "Router konfigurieren, der über die entsprechende Router-ID verfügt."
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr "Agent sollte Router ohne Gateway implementieren"
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr "UUID von externem Netz für von den Agenten implementierte Router."
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr "Ein Schnittstellentreiber muss angegeben sein"
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr "Namensbereich '%s' wurde nicht gelöscht"
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr "Routerport %s verfügt über keine IP-Adresse"
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr "Ignorieren mehrerer IP-Adressen auf Routerport %s"
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr "Gratuitous ARP wurde nicht gesendet: %s"
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr "Fehler beim Umgang mit RPC-Nachricht zur Löschung von Router '%s'"
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr "Fehler beim Umgang mit RPC-Nachricht zur Aktualisierung der Router"
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr "Die externe Netzbrücke '%s' ist nicht vorhanden"
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr "Synchronisation von Routern fehlgeschlagen"
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr "Agent der Ebene 3 gestartet"
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr "Der hinzugefügte Routeneintrag lautet '%s'"
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr "Der entfernte Routeneintrag lautet '%s'"
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr "Löschen Sie den Namensbereich durch Entfernen aller Geräte."
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr "Brücke für Gerät kann nicht gefunden werden: %s"
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr "Fehler, Löschen von Namensbereich nicht möglich: %s"
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
-"'True' zum Löschen aller Ports auf den OpenvSwitch-Brücken. 'False' zum "
-"Löschen von Ports, die von Quantum auf Integrationsbrücken und externen "
-"Netzbrücken erstellt wurden."
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr "%s löschen"
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr "Bereinigung von %s"
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr "OVS-Bereinigungsprozedur erfolgreich abgeschlossen"
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr "Sicherheitsgruppenerweiterung wurde inaktiviert."
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr "Abrufen von Sicherheitsgruppenregeln für Geräte über RPC %r"
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr "Sicherheitsgruppenregel auf fernem Server aktualisiert: %s"
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr "Sicherheitsgruppenelement auf fernem Server aktualisiert: %s"
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr "Provider-Regel aktualisiert"
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr "Initialisierung von Firewalleinstellungen (driver=%s)"
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr "Vorbereiten von Filtern für Geräte %s"
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr "Sicherheitsgruppenregel aktualisiert %r"
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr "Sicherheitsgruppenmitglied aktualisiert %r"
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr "Gerätefilter für %r entfernen"
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr "Firewallregeln aktualisieren"
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr "Portfilter für %s aktualisieren"
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr "Stammhilfsanwendung."
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr "Sekunden zwischen Status-Berichten von Knoten an Server"
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr "Basisverzeichnis zum Warten von DHCP-Status"
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr "Fehler beim Öffnen von PID-Datei: %s"
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr "PID-Datei kann nicht gesperrt werden"
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr "PID-Datei kann nicht entsperrt werden"
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr "Fehler bei Verzweigung"
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr "PID-Datei %s ist bereits vorhanden. Dämon bereits aktiv?"
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr "Position zum Speichern von Konfigurationsdateien des DHCP-Servers"
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr "Für das Erstellen von Hostnamen zu verwendende Domäne"
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr "Standard-'dnsmasq'-Einstellungen mit dieser Datei außer Kraft setzen"
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr "Anderen DNS-Server vor allen in '/etc/resolv.conf' verwenden."
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr "DHCP für %(net_id)s-PID %(pid)d ist veraltet. Befehl wird ignoriert"
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr "Kein DHCP für %s gestartet"
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr "Wert in %s kann nicht konvertiert werden"
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr "Kein Zugriff auf %s möglich"
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 "'dhcpmasq' für Netz wird beendet, da alle Teilnetze DHCP ausgeschaltet "
 "haben: %s"
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr "Neuladen von Zuordnungen für Netz: %s"
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr "Position zum Speichern von untergeordneten PID-Dateien"
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr "Prozess für %(uuid)s-PID %(pid)d ist veraltet. Befehl wird ignoriert"
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr "Kein Prozess für %s gestartet"
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr "Name der zu verwendenden Open vSwitch-Brücke"
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr "Verwendet virtuelles Ethernet für eine Schnittstelle oder nicht"
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr "MTU-Einstellung für Gerät."
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr "Zuordnung zwischen Version und LinuxInterfaceDriver"
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr "Administratorbenutzername"
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr "Administratorkennwort"
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr "Administratornutzername"
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr "Authentifizierungs-URL"
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr "Der zu verwendende Authentifizierungtyp"
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr "Authentifizierungsregion"
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr "Gerät %s ist bereits vorhanden"
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr "Verbindung zu Schnittstelle '%s' getrennt"
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr "Fehler beim Trennen von Verbindung zu Schnittstelle '%s'"
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr "Treiberposition: %s"
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr "Kein Namensbereich für übergeordnetes Element definiert"
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr "Vorbereitung von Filter für Gerät (%s)"
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr "Aktualisieren von Filter für Gerät (%s)"
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr "Versuch, ungefilterten Portfilter %s zu aktualisieren"
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr "Entfernen von Filter für Gerät (%s)"
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr "Versuch, ungefilterten Portfilter %r zu entfernen"
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "Versuch, nicht vorhandene Kette %s zu löschen"
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "Unbekannte Kette: %r"
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
@@ -949,60 +948,60 @@ msgstr ""
 "Versuch, nicht vorhandene Regel zu entfernen: %(chain)r %(rule)r %(wrap)r"
 " %(top)r"
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr "'IPTablesManager.apply' erfolgreich abgeschlossen"
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr "Ausführen von %(cmd)s nicht möglich. Ausnahme: %(exception)s"
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr "Abgleichen von Priorität bei Ablauflöschung nicht möglich"
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr "Angabe von einer oder mehreren Aktionen erforderlich"
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 "Ergebnisse von regulären Ausdrücken können nicht analysiert werden. "
 "Ausnahme: %s"
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, fuzzy, python-format
 msgid "Unable to determine mac address for %s"
 msgstr "Erstellen von MAC-Adresse nach %s Versuchen nicht möglich"
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr "Brücken können nicht abgerufen werden. Ausnahme: %s"
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr "Ausführung von Befehl: %s"
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -1017,48 +1016,48 @@ msgstr ""
 "Standardausgabe: %(stdout)r\n"
 "Standardfehler: %(stderr)r"
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr "Benutzer mit Administratorberechtigung"
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr "Von Nova-Metadatenserver verwendete IP-Adresse."
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr "Von Nova-Metadatenserver verwendeter TCP-Port."
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 "Geheimer Schlüssel für gemeinsame Nutzung zum Unterzeichnen von Instanz-"
 "ID-Anforderung"
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr "Anforderung: %s"
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr "Unerwarteter Fehler."
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 "Ein unbekannter Fehler ist aufgetreten. Stellen Sie Ihre Anforderung "
 "erneut."
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
@@ -1067,34 +1066,34 @@ msgstr ""
 "tritt üblicherweise auf, wenn geheime Schlüssel für die gemeinsame "
 "Nutzung nicht übereinstimmen."
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr "Interner Serverfehler bei fernem Metadatenserver."
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr "Unerwarteter Antwortcode: %s"
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr "Position für UNIX-Domänensocket von Metadatenproxy"
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr "Position von UNIX-Domänensocket von Metadatenproxy"
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr "'network_id' und 'router_id' sind 'None'. Ein Wert muss angegeben sein."
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr "TCP-Port zum Empfangen von Anforderungen des Metadatenservers."
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
@@ -1103,21 +1102,21 @@ msgstr ""
 "Ungültiger Wert für 'pagination_max_limit': %s. Der Wert sollte eine "
 "Ganzzahl größer 0 sein."
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr "Der Grenzwert muss eine Ganzzahl größer 0 sein und nicht '%d'"
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr "Die Anzahl an 'sort_keys' und 'sort_dirs' muss gleich sein"
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr "%s ist ein ungültiges Attribut für 'sort_keys'"
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
@@ -1126,135 +1125,135 @@ msgstr ""
 "%(invalid_dirs)s ist ein ungültiger Wert für 'sort_dirs'; gültige Werte "
 "sind '%(asc)s' und '%(desc)s'"
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr "'%s' kann in Anforderungshauptteil nicht gefunden werden"
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr "Anforderung wurde nicht analysiert. Parameter '%s' nicht angegeben"
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr "Erweiterung mit Alias %s ist nicht vorhanden"
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr "Erweiterte Ressource: %s"
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr "Erweiterte Aktion: %s"
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr "Erweiterte Anforderung: %s"
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr "Erweiterungsmanager wird initialisiert."
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr "Fehler beim Abrufen erweiterter Attribute für Erweiterung '%s'"
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr "Erweiterungsname: %s"
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr "Erweiterungsalias: %s"
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr "Erweiterungsbeschreibung: %s"
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "Erweiterungsnamensbereich: %s"
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr "Erweiterung aktualisiert: %s"
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "Ausnahme beim Laden von Erweiterung: %s"
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr "Erweiterungspfad '%s' ist nicht vorhanden!"
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr "Laden von Erweiterungsdatei: %s"
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr "Erwarteter Name \"%(ext_name)s\" konnte in %(file)s nicht gefunden werden"
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr "Erweiterungsdatei %(f)s wurde aufgrund von %(exception)s nicht geladen"
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "Geladene Erweiterung: %s"
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr "Doppelte Erweiterung gefunden: %s"
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr "Erweiterung %s von keinem der geladenen Plug-ins unterstützt"
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr "Geladene Plug-ins implementieren Schnittstelle für Erweiterung %s nicht"
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr "Agenten unter %(host)s über die Methode %(method)s benachrichtigen"
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 "Agenten unter %(topic)s.%(host)s über die Methode %(method)s "
 "benachrichtigen"
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
@@ -1263,7 +1262,7 @@ msgstr ""
 "Fan-out benachrichtigt Agenten unter %(topic)s über die Methode "
 "%(method)s auf Router %(router_id)s"
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
@@ -1272,7 +1271,7 @@ msgstr ""
 "Ungültige Eingabe. '%(target_dict)s' muss ein Verzeichnis mit Schlüsseln "
 "sein: %(expected_keys)s"
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
@@ -1282,183 +1281,183 @@ msgstr ""
 "Erwartete Schlüssel: %(expected_keys)s Angegebene Schlüssel: "
 "%(provided_keys)s"
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr "'%(data)s' befindet sich nicht in %(valid_values)s"
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr "'%s' ist keine gültige Zeichenfolge"
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr "'%(data)s' überschreitet die Höchstlänge von %(max_len)s"
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, fuzzy, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr "'%s' ist keine gültige Eingabe"
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 "'%(data)s' befinden sich nicht im Bereich zwischen %(min_value)s und "
 "%(max_value)s"
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr "'%s' ist keine gültige MAC-Adresse"
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr "'%s' ist keine gültige IP-Adresse"
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr "Ungültiges Datenformat für IP-Pool: '%s'"
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr "Ungültiges Datenformat für statische IP: '%s'"
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr "Doppelte IP-Adresse '%s'"
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr "Ungültiges Datenformat für Namensserver: '%s'"
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr "'%s' ist kein gültiger Namensserver"
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr "Doppelter Namensserver '%s'"
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr "Ungültiges Datenformat für Hostroute: '%s'"
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr "Doppelte Hostroute '%s'"
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr "'%s' ist kein gültiges IP-Teilnetz"
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr "'%s' ist keine gültige Eingabe"
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s' ist keine gültige UUID"
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr "'%s' ist keine Liste"
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr "Doppelte Elemente in der Liste: '%s'"
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr "%s ist kein Verzeichnis"
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr "Der Validator '%s' ist nicht vorhanden."
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr "'%s' ist keine Ganzzahl"
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr "'%s' sollte nicht negativ sein"
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr "'%s' kann nicht in boolesche Zahl umgewandelt werden"
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr "'%s' ist keine Ganzzahl"
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr "'%s' ist nicht in der Form <key>=[value]"
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr "Die native Paginierung ist von der nativen Sortierung abhängig"
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 "Das Zulassen der Sortierung ist aktiviert, da die native Paginierung die "
 "native Sortierung erfordert"
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr "Hinzufügen kann für %(resource)s %(id)s nicht rückgängig gemacht werden"
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr "Ungültiges Format: %s"
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
@@ -1467,120 +1466,120 @@ msgstr ""
 "authentifizierte Nutzer-ID anzugeben, sind Administratorberechtigungen "
 "erforderlich"
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 #, fuzzy
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 "Zum Ausführen ohne Keystone-Authentifizierung muss 'tenant_id' angegeben "
 "sein"
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr "Ressourcen-Nachrichtentext erforderlich"
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr "Massenoperation nicht unterstützt"
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr "Ressourcen erforderlich"
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 "Anforderung wurde nicht analysiert. Erforderliches Attribut %s nicht "
 "angegeben"
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr "Attribut %s in POST nicht zulässig"
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr "Schreibgeschütztes Attribut %s kann nicht aktualisiert werden"
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr "Ungültige Eingabe für %(attr)s. Grund: %(reason)s."
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr "Nicht erkannte(s) Attribut(e) '%s'"
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr "Nutzer %(tenant_id)s darf %(resource)s auf diesem Netz nicht erstellen"
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr "%s fehlgeschlagen"
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 "Anforderung fehlgeschlagen: interner Serverfehler bei Verarbeitung Ihrer "
 "Anforderung."
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr "Das Host-IP, an das gebunden werden soll"
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr "Der Port, an den gebunden werden soll"
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr "Zu verwendende API-Paste-Konfigurationsdatei"
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr "Der Pfad für API-Erweiterungen"
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr "Die zu verwendende Richtliniendatei"
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
-msgstr "Kern-Plug-in, das Quantum verwenden wird"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
+msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
-msgstr "Service-Plug-ins, die Quantum verwenden wird"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
+msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
-msgstr "Basis-MAC-Adresse, die Quantum für VIFs verwenden wird"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
+msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
-msgstr "Wie oft Quantum die MAC-Adressenerstellung erneut versuchen wird"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
+msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr "Nutzung der Massenzuweisungs-API zulassen"
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr "Nutzung der Paginierung zulassen"
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr "Nutzung der Sortierung zulassen"
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
@@ -1589,134 +1588,134 @@ msgstr ""
 "Der Wert 'infinite' oder eine negative Ganzzahl bedeuten, dass es keine "
 "Begrenzung gibt"
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr "Maximale Anzahl an DNS-Namensservern"
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr "Maximale Anzahl an Hostroutes pro Teilnetz"
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr "Maximale Anzahl an statischen IP-Adressen per Port"
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr "DHCP-Leasedauer"
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 "Senden von Benachrichtigungen zu Ressourcenoperationen an den DHCP-"
 "Agenten zulassen"
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
-msgstr "Überschneidung bei IP-Support in Quantum zulassen"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
+msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
-msgstr "Name von Host, auf dem Quantum ausgeführt wird"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
+msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 "Stellen Sie sicher, dass sich das konfigurierte Gateway auf dem Teilnetz "
 "befindet"
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr "Basis-MAC-Adresse: %s"
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr "Protokollfunktion aktiviert!"
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr "Konfigurations-Paste-Datei: %s"
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 "%(app_name)s kann nicht von Konfigurationsdatei %(config_path)s geladen "
 "werden."
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr "Eine unbekannte Ausnahme ist aufgetreten."
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr "Fehlerhafte %(resource)s-Anfrage: %(msg)s"
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr "Nicht autorisiert."
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr "Der Service ist nicht verfügbar"
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr "Benutzer verfügt nicht über Administrator-Berechtigung: %(reason)s"
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "Richtlinie lässt Ausführung von %(action)s nicht zu."
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr "Netz %(net_id)s konnte nicht gefunden werden"
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr "Teilnetz %(subnet_id)s konnte nicht gefunden werden"
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr "Port %(port_id)s konnte nicht auf Netz %(net_id)s gefunden werden"
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr "Policy-Konfiguration 'policy.json' konnte nicht gefunden werden"
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr "Nicht unterstützter Portstatus: %(port_state)s"
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr "Die Ressource ist belegt"
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
@@ -1725,7 +1724,7 @@ msgstr ""
 "Operation auf Netz %(net_id)s kann nicht abgeschlossen werden. Ein oder "
 "mehrere Ports werden im Netz noch verwendet."
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
@@ -1734,7 +1733,7 @@ msgstr ""
 "Operation auf Teilnetz %(subnet_id)s kann nicht abgeschlossen werden. Ein"
 " oder mehrere Ports verfügen über eine IP-Zuordnung von diesem Teilnetz."
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
@@ -1744,7 +1743,7 @@ msgstr ""
 "abgeschlossen werden. Port verfügt bereits über eine angehängte Einheit "
 "%(device_id)s."
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
@@ -1753,7 +1752,7 @@ msgstr ""
 "Operation kann für Netz %(net_id)s nicht abgeschlossen werden. Die MAC-"
 "Adresse %(mac)s ist belegt."
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
@@ -1762,7 +1761,7 @@ msgstr ""
 "Operation kann für %(subnet_id)s nicht abgeschlossen werden. Die Anzahl "
 "an Hostroutes überschreitet den Grenzwert %(quota)s."
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
@@ -1771,7 +1770,7 @@ msgstr ""
 "Operation kann für %(subnet_id)s nicht abgeschlossen werden. Die Anzahl "
 "an DNS-Namensservern überschreitet den Grenzwert %(quota)s."
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
@@ -1780,7 +1779,7 @@ msgstr ""
 "Operation kann für Netz %(net_id)s nicht abgeschlossen werden. Die IP-"
 "Adresse %(ip_address)s ist belegt."
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
@@ -1789,7 +1788,7 @@ msgstr ""
 "Das Netz kann nicht erstellt werden. Das VLAN %(vlan_id)s auf dem "
 "physischen Netz %(physical_network)s ist belegt."
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
@@ -1798,18 +1797,18 @@ msgstr ""
 "Das einfache Netz kann nicht erstellt werden. Das physische Netz "
 "%(physical_network)s ist belegt."
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 "Das Netz kann nicht erstellt werden. Die Tunnel-ID %(tunnel_id)s ist "
 "belegt."
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr "Erstellung von Nutzernetzen ist nicht aktiviert."
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
@@ -1817,7 +1816,7 @@ msgstr ""
 "Das Netz kann nicht erstellt werden. Es ist kein Nutzernetz für die "
 "Zuordnung verfügbar."
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1828,7 +1827,7 @@ msgstr ""
 "%(net_id)s verbunden werden. Die Zusatzeinheit ist bereits mit Port "
 "%(att_port_id)s verbunden"
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
@@ -1837,22 +1836,22 @@ msgstr ""
 "Teilnetz auf Port %(port_id)s stimmt nicht mit dem angeforderten Teilnetz"
 " %(subnet_id)s überein"
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr "Fehlerhafter Anforderungshauptteil: %(reason)s"
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr "Ungültige Eingabe für Operation: %(error_message)s."
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr "Der Zuordnungspool %(pool)s ist nicht gültig."
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
@@ -1861,52 +1860,52 @@ msgstr ""
 "Überschneidung bei Zuordnungspools %(pool_1)s %(pool_2)s für Teilnetz "
 "%(subnet_cidr)s gefunden. "
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 "Der Zuordnungspool %(pool)s geht über das Teilnetz-CIDR %(subnet_cidr)s "
 "hinaus."
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr "Eindeutige MAC-Adresse kann auf Netz %(net_id)s nicht generiert werden."
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr "Keine weiteren IP-Adressen auf Netz %(net_id)s verfügbar."
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr "Brücke %(bridge)s ist nicht vorhanden."
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr "Erstellung fehlgeschlagen. %(dev_name)s ist bereits vorhanden."
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr "Sudo-Berechtigung ist zum Ausführen dieses Befehls erforderlich."
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "Unbekannte Quotenressourcen %(unknown)s."
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "Quote für Ressourcen überschritten: %(overs)s"
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr "Nutzer-ID aus Quotenanforderung hat gefehlt"
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
@@ -1915,7 +1914,7 @@ msgstr ""
 "Durch die Änderung wäre die Nutzung kleiner als 0 für die folgenden "
 "Ressourcen: %(unders)s"
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
@@ -1924,116 +1923,126 @@ msgstr ""
 "Freigabeeinstellungen für Netz %(network)s können nicht rekonfiguriert "
 "werden. Mehrere Nutzer verwenden es."
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr "Ungültige Erweiterungsumgebung: %(reason)s"
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, fuzzy, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr "Es können keine IP-Adressen auf externem Netz gefunden werden"
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr "Es sind mehrere externe Netze vorhanden"
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr "Ein ungültiger Wert wurde für %(opt_name)s angegeben: %(opt_value)s"
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr "Gateway-IP '%(ip_address)s' steht im Konflikt mit Zuordnungspool %(pool)s"
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr "Im Cache gespeicherte Datei %s wird neu geladen"
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr "Ungültige Zuordnung: '%s'"
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr "Fehlender Schlüssel in Zuordnung: '%s'"
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr "Fehlender Wert in Zuordnung: '%s'"
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr "Schlüssel %(key)s in Zuordnung: '%(mapping)s' nicht eindeutig"
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr "Wert %(value)s in Zuordnung: '%(mapping)s' nicht eindeutig"
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr "Sekunden bis zur Annahme, dass der Agent inaktiv ist. "
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 "Die Konfiguration des Agenten %(agent_type)s auf Host %(host)s ist "
 "ungültig."
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr "Nachricht mit ungültiger Zeitmarke empfangen"
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr "Planung des Netzes '%s' fehlgeschlagen"
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "Datenbankregistrierungsausnahme: %s"
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr "Erstellen von Ressource für einen weiteren Nutzer nicht möglich"
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr "Erstellte MAC-Adresse für Netz %(network_id)s ist %(mac_address)s"
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 "Erstellte MAC-Adresse %(mac_address)s ist bereits vorhanden. "
 "%(max_retries)s verbleibende Versuche."
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr "Erstellen von MAC-Adresse nach %s Versuchen nicht möglich"
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
@@ -2042,49 +2051,49 @@ msgstr ""
 "Zugeordnete IP-Adresse %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s) blockieren"
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr "Kein Zuordnungspool für IP-Adresse gefunden:%s"
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr "%s erneut starten"
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: erste Übereinstimmung für %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: letzte Übereinstimmung für %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 "Erneut starten: %(first_ip1)s-%(last_ip1)s und %(first_ip2)s-%(last_ip2)s"
 " zusammengefügt"
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: zuerst %(first_ip)s-%(last_ip)s aktualisiert"
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: zuletzt %(first_ip)s-%(last_ip)s aktualisiert"
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr "Erneut starten: %(first_ip)s-%(last_ip)s neu erstellt"
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
@@ -2093,41 +2102,41 @@ msgstr ""
 "Keine statische IP-Adresse gefunden, die mit Netz %(network_id)s und IP-"
 "Adresse %(ip_address)s übereinstimmt."
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 "Löschen von zugeordneter IP-Adresse %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr "Alle IP-Adressen von Teilnetz %(subnet_id)s (%(cidr)s) zugeordnet"
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr "Zugeordnete IP-Adresse - %(ip_address)s von %(first_ip)s bis %(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 "Keine weiteren freien IP-Adressen in Ausschnitt. Löschen von "
 "Zuordnungspool."
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr "'subnet_id' oder 'ip_address' für IP-Zuordnung erforderlich"
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 "IP-Adresse %s ist keine gültige IP-Adresse für die definierten Teilnetze "
 "des Netzes"
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
@@ -2136,26 +2145,26 @@ msgstr ""
 "Port auf Netz %(network_id)s wurde nicht erstellt, da 'fixed_ips' "
 "ungültiges Teilnetz %(subnet_id)s enthielt"
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr "IP-Adresse %s ist keine gültige IP-Adresse für das definierte Teilnetz"
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr "Maximale Anzahl an statischen IP-Adressen per Port überschritten"
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr "Portaktualisierung. Rückstellung von %s"
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr "Portaktualisierung. Hinzufügen von %s"
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
@@ -2164,7 +2173,7 @@ msgstr ""
 "Angefordertes Teilnetz mit CIDR: %(cidr)s für Netz: %(network_id)s "
 "enthält Überschneidungen mit einem anderen Teilnetz"
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -2173,90 +2182,90 @@ msgstr ""
 "Überprüfung für CIDR: %(new_cidr)s fehlgeschlagen - Überschneidung mit "
 "Teilnetz %(subnet_id)s (CIDR: %(cidr)s)"
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr "Durchführen von IP-Gültigkeitsprüfungen für Zuordnungspools"
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "Ungültige IP-Adresse in Pool gefunden: %(start)s - %(end)s:"
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr "Angegebene IP-Adressen stimmen nicht mit der Teilnetz-IP-Version überein"
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "Anfangs-IP-Adresse (%(start)s) ist größer als Ende-IP-Adresse (%(end)s)"
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "Pool gefunden, der größer ist als Teilnetz-CIDR:%(start)s - %(end)s"
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr "Überprüfung auf Überschneidungen bei Zuordnungspools und Gateway-IP"
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "Überschneidungen bei Bereichen gefunden: %(l_range)s und %(r_range)s"
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr "Ungültige Route: %s"
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr "Beim Erstellen von %(resource)s:%(item)s ist eine Ausnahme aufgetreten"
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr "%(name)s '%(addr)s' stimmt nicht mit 'ip_version' '%(ip_version)s' überein"
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr "Gateway ist auf Teilnetz nicht gültig"
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr "Fehler bei Auswertung der DNS-Adresse %s"
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 "Zugeordnete IP-Adresse %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr "%(address)s (%(subnet_id)s) wurde nicht erneut gestartet"
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr "Netzliste von %s angefordert"
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr "Netz %(network_id)s von %(host)s angefordert"
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr "Port %(device_id)s für %(network_id)s von %(host)s angefordert"
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
@@ -2265,19 +2274,19 @@ msgstr ""
 "DHCP-Port %(device_id)s auf Netz %(network_id)s ist auf %(host)s nicht "
 "vorhanden"
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr "Löschen von DHCP-Port für %(network_id)s-Anforderung von %(host)s"
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 "'fixed_ip' für %(subnet_id)s-Anforderung von %(host)s von DHCP-Port "
 "entfernt"
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
@@ -2286,34 +2295,34 @@ msgstr ""
 "Aktualisierung von Leaseablauf für %(ip_address)s auf Netz %(network_id)s"
 " von %(host)s."
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr "Maximale Anzahl an Routen"
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr "Der nächste Hop ist nicht mit dem Router verbunden"
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr "Der nächste Hop wird vom Router verwendet"
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr "Keine IP-Adressen für externes Netz %s verfügbar"
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr "Netz %s ist kein gültiges externes Netz"
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr "Router verfügt bereits über einen Port auf Teilnetz %s"
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
@@ -2322,32 +2331,32 @@ msgstr ""
 "Überschneidungen zwischen CIDR %(subnet_cidr)s von Teilnetz %(subnet_id)s"
 " und CIDR %(cidr)s von Teilnetz %(sub_id)s"
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr "Entweder 'subnet_id' oder 'port_id' muss angegeben sein"
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr "Angabe sowohl von Teilnetz-ID als auch von Port-ID nicht möglich"
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr "Routerport muss über genau eine statische IP-Adresse verfügen"
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 "Teilnetz für Routerschnittstelle muss über eine Gateway-IP-Adresse "
 "verfügen"
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 "Dynamische IP-Adresse kann nicht zu Port auf Teilnetz %s ohne "
 "'gateway_ip' hinzugefügt werden"
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
@@ -2356,26 +2365,26 @@ msgstr ""
 "Port %(port_id)s ist einem anderen Nutzer zugeordnet als die dynamische "
 "IP-Adresse %(floatingip_id)s und kann daher nicht gebunden werden."
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr "Port %(id)s verfügt nicht über statische IP-Adresse %(address)s"
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 "Dynamische IP-Adresse kann nicht zu Port %s hinzugefügt werden, der über "
 "keine statischen IP-Adressen verfügt"
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
@@ -2385,11 +2394,11 @@ msgstr ""
 "bestimmten IP-Adresse bei Zuweisung einer dynamischen IP-Adresse "
 "erforderlich"
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr "'fixed_ip_address' kann nicht ohne 'port_id' angegeben werden"
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
@@ -2398,17 +2407,17 @@ msgstr ""
 "Port %(port_id)s hat Eigentümer %(port_owner)s, aber keine IP-Adresse und"
 " kann daher gelöscht werden"
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr "Mehrere dynamische IP-Adressen für Port %s gefunden"
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr "Port %s wird übersprungen, da keine IP-Adresse auf ihm konfiguriert ist"
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
@@ -2417,21 +2426,21 @@ msgstr ""
 "Router an Agent der Ebene 3 zurückgegeben:\n"
 " %s"
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr "Externe Netz-ID an Agent der Ebene 3 zurückgegeben:%s"
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr "Ressourcentyp '%(resource_type)s' hat mehr als %(maxlen)d Zeichen"
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr "Beschreibung für den Standardservicetyp"
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
@@ -2439,7 +2448,7 @@ msgstr ""
 "Definiert einen Provider für einen erweiterten Service im Format: "
 "<service>:<plugin>[:<driver>]"
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
@@ -2448,19 +2457,19 @@ msgstr ""
 "Standardservicetyp - kein Treiber für Service %(service_class)s und Plug-"
 "in %(plugin)s"
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr "Servicetyp %(service_type_id)s konnte nicht gefunden werden "
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
@@ -2469,38 +2478,36 @@ msgstr ""
 "Es sind noch aktive Instanzen von Servicetyp '%(service_type_id)s' "
 "vorhanden. Daher kann er nicht entfernt werden."
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
-"Datensatz für Standardservicetyp in Quantum-Datenbank aktualisiert. ID "
-"ist '%s'."
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 "Mehrere Instanzen von Standardservicetyp gefunden. Verwendung von Instanz"
 " '%s'"
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr "Servicetypobjekt erstellt:%s"
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr "Anzahl an Instanzen für Servicetyp '%s' ist bereits 0."
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr "%s ist ein ungültiges Attribut für 'sort_key'"
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
@@ -2509,133 +2516,131 @@ msgstr ""
 "Das Attribut %(attr)s ist ein Verweis auf eine andere Ressource und kann "
 "bei der Sortierung von %(resource)s nicht verwendet werden"
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr "'cookie_name' sollte für diesen Sitzungspersistenztyp angegeben werden."
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr "'cookie_name' ist für diesen Sitzungspersistenztyp nicht zulässig"
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
-msgstr "Provider-Modul für Quantum-Plug-in"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
+msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
-msgstr "Quantum-Quotentreiberklasse"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
+msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr "URL an Datenbank"
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr "Sie müssen eine Überarbeitung oder ein relatives Delta bereitstellen"
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr "Verfügbare Befehle"
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr "Nicht implementierte Befehle"
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr "ID von Netz, das überprüft werden soll"
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr "Eigentümertyp des Geräts: Netz/Rechenknoten"
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr "Stichprobe erstellt: %s "
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr "ID von Überprüfungsport, der gelöscht werden soll"
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr "Stichprobe %s gelöscht"
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr "Alle Stichproben gelöscht "
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr "ID von Überprüfungsport zum Ausführen des Befehls"
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr "Auszuführender Befehl"
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr "Ping-Zeitlimitüberschreitung"
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr "Netz-ID"
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr "Netz-Namensbereiche von Linux verwenden"
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr "Fehler beim Löschen von Namensbereich %s"
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 "Konfigurationsdatei für Schnittstellentreiber (Sie können auch "
 "'l3_agent.ini' verwenden)"
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
-"Sie müssen eine Konfigurationsdatei für die Brücke angeben: entweder "
-"'--config-file' oder env[QUANTUM_TEST_CONFIG_FILE]"
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr "Agent %(id)s konnte nicht gefunden werden"
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 "Agent mit 'agent_type=%(agent_type)s' und 'host=%(host)s' konnte nicht "
 "gefunden werden"
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 "Mehrere Agenten mit 'agent_type=%(agent_type)s' und 'host=%(host)s' "
 "wurden gefunden"
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr "Agent %(id)s ist kein gültiger DHCP-Agent oder wurde inaktiviert"
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
@@ -2644,17 +2649,17 @@ msgstr ""
 "Das Netz %(network_id)s wurde bereits vom DHCP-Agenten %(agent_id)s "
 "gehostet."
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr "Das Netz %(network_id)s wird nicht vom DHCP-Agenten %(agent_id)s gehostet."
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr "Agent %(id)s ist kein L3-Agent oder wurde inaktiviert"
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
@@ -2663,24 +2668,24 @@ msgstr ""
 "Der Router %(router_id)s wurde bereits vom L3-Agenten %(agent_id)s "
 "gehostet."
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 "Zuordnung des Routers %(router_id)s zum L3-Agenten %(agent_id)s ist "
 "fehlgeschlagen."
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr "Der Router %(router_id)s wird nicht vom L3-Agenten %(agent_id)s gehostet."
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr "Ungültiges Format für Routen: %(routes)s, %(reason)s"
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
@@ -2690,7 +2695,7 @@ msgstr ""
 "kann nicht gelöscht werden, da sie für eine oder mehrere Routen "
 "erforderlich ist."
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
@@ -2699,29 +2704,29 @@ msgstr ""
 "Operation kann für %(router_id)s nicht abgeschlossen werden. Die Anzahl "
 "an Routen überschreitet den maximalen Wert %(quota)s."
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr "Router %(router_id)s konnte nicht gefunden werden"
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr "Router %(router_id)s verfügt noch über aktive Ports"
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr "Router %(router_id)s verfügt über keine Schnittstelle mit ID %(port_id)s"
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 "Router %(router_id)s verfügt über keine Schnittstelle auf Teilnetz "
 "%(subnet_id)s"
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
@@ -2731,12 +2736,12 @@ msgstr ""
 "kann nicht gelöscht werden, da sie für eine oder mehrere dynamische IP-"
 "Adressen erforderlich ist."
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr "Dynamische IP-Adresse %(floatingip_id)s konnte nicht gefunden werden"
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2747,7 +2752,7 @@ msgstr ""
 "nicht erreichbar. Daher kann Port %(port_id)s keiner dynamischen IP-"
 "Adresse zugeordnet werden."
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2759,7 +2764,7 @@ msgstr ""
 "werden, da diese statische IP-Adresse bereits über eine dynamische IP-"
 "Adresse im externen Netz %(net_id)s verfügt."
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
@@ -2768,7 +2773,7 @@ msgstr ""
 "Port %(port_id)s hat Eigentümer %(device_owner)s und kann daher nicht "
 "direkt über die Port-API gelöscht werden."
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
@@ -2777,7 +2782,7 @@ msgstr ""
 "Externes Netz %(net_id)s kann nicht so aktualisiert werden, dass es nicht"
 " mehr extern ist, da es über Gateway-Ports verfügt"
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
@@ -2787,71 +2792,71 @@ msgstr ""
 "Gateway zum externen Netz %(net_id)s für eine oder mehrere dynamische IP-"
 "Adressen erforderlich ist. "
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr "Anzahl an zulässigen Routern pro Nutzer, -1 für unbegrenzt"
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr "Anzahl an zulässigen dynamischen IP-Adressen pro Nutzer, -1 für unbegrenzt"
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr "VIP %(vip_id)s konnte nicht gefunden werden"
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr "Pool %(pool_id)s konnte nicht gefunden werden"
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr "Element %(member_id)s konnte nicht gefunden werden"
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr "'Health_monitor' %(monitor_id)s konnte nicht gefunden werden"
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 "Ungültiger Status %(state)s von Ressource für Lastausgleichsfunktion "
 "%(id)s"
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr "Pool %(pool_id)s ist noch belegt"
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr "Statistikdaten von Pool %(pool_id)s konnten nicht gefunden werden"
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 "Protokoll %(vip_proto)s stimmt nicht mit Poolprotokoll %(pool_proto)s "
 "überein"
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
@@ -2860,7 +2865,7 @@ msgstr ""
 "Portsicherheit oder IP-Adresse nur nach Entfernen der Sicherheitsgruppe "
 "möglich"
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
@@ -2868,51 +2873,51 @@ msgstr ""
 "Portsicherheit muss aktiviert sein und Port muss über eine IP-Adresse "
 "verfügen, damit Sicherheitsgruppen verwendet werden können."
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr "Port verfügt nicht über Portsicherheitsbindung."
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr "Aktualisieren von Provider-Attributen wird von Plug-in nicht unterstützt"
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 "Nicht-Admins sind nicht dazu berechtigt, auf Quoten für andere Nutzer "
 "zuzugreifen"
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr "Nur Admins können Quoten anzeigen oder konfigurieren"
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr "Für TCP/UDP-Protokolle muss 'port_range_min' '<= port_range_max' sein"
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr "Ungültiger Wert für Port %(port)s"
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr "Sicherheitsgruppe %(id)s belegt."
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr "Entfernen von Standardsicherheitsgruppe nicht zulässig."
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr "Standardsicherheitsgruppe ist bereits vorhanden."
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, fuzzy, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2922,64 +2927,64 @@ msgstr ""
 "Regelprotokoll %(protocol)s für Sicherheitsgruppe nicht unterstützt. Nur "
 "Protokollwerte %(values)s werden unterstützt."
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 "Mehrere 'tenant_ids' bei Erstellung von Sicherheitsgruppenregel für "
 "Massenerstellung nicht zulässig"
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr "Nur Angabe von 'remote_ip_prefix' oder 'remote_group_id' ist zulässig."
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr "Bei angegebenem Portbereich muss ebenfalls ein Protokoll angegeben werden."
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 "Aktualisierung von Regeln nicht für mehrere Sicherheitsprofile "
 "gleichzeitig zulässig"
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr "Sicherheitsgruppe %(id)s ist nicht vorhanden"
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr "Sicherheitsgruppenregel %(id)s ist nicht vorhanden"
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr "Doppelte Sicherheitsgruppenregel in POST."
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr "Sicherheitsgruppenregel ist bereits vorhanden. Gruppen-ID ist %(id)s."
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr "'%s' ist keine Ganzzahl und keine UUID"
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr "Anzahl an zulässigen Sicherheitsgruppen pro Nutzer, -1 für unbegrenzt"
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr "Anzahl an zulässigen Sicherheitsregeln pro Nutzer, -1 für unbegrenzt"
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr "Der Servicetyp '%s' ist nicht vorhanden"
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
@@ -2987,318 +2992,316 @@ msgstr ""
 "Es wurde keine Servicetypdefinition angegeben. Mindestens eine "
 "Servicetypdefinition muss angegeben sein"
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr "Erforderliche Attribute fehlen in Servicedefinition: %s"
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr "%(f_name)s: %(msg)s"
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr "Servicename '%s' nicht angegeben oder ungültig"
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr "Plug-in-Name nicht in Servicedefinition %s angegeben"
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr "Kein Plug-in für Service '%s'"
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr "Plug-in-Name '%s' ist nicht korrekt "
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr "Nicht analysierbare Attribute in Servicedefinition %s gefunden"
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr "Ausnahme bei Analyse von Servicedefinition:%s"
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr "%s: angegebene Daten sind nicht wiederholbar"
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
-msgstr "Quantum-Servicetypverwaltung"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
+msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
-"API zum Abrufen und Verwalten von Servicetypen für erweiterte Quantum-"
-"Services"
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr "Nicht abgefangene Ausnahme"
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr "Ursprüngliche Ausnahme wird gelöscht: %s"
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/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:189
+#: neutron/openstack/common/lockutils.py:189
 #, 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:200
+#: neutron/openstack/common/lockutils.py:200
 #, 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:227
+#: neutron/openstack/common/lockutils.py:227
 #, 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:235
+#: neutron/openstack/common/lockutils.py:235
 #, 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:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr "Veraltet: %s"
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/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:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "Schwerwiegender Aufruf an veraltete Konfiguration: %(msg)s"
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr "Ausgeführte Task hat Intervall um %s Sekunden überschritten"
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/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:184
+#: neutron/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:395
+#: neutron/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:405
+#: neutron/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:680
+#: neutron/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:127
+#: neutron/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:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "CMD wird ausgeführt (Unterprozess): %s"
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr "Ergebnis war %s"
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r fehlgeschlagen. Neuversuch."
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, fuzzy, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "CMD wird ausgeführt (Unterprozess): %s"
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr "Vollständiger Satz von CONF:"
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "%s abgefangen; Vorgang wird beendet"
 
-#: quantum/openstack/common/service.py:165
+#: neutron/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:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr "Verzweigung zu schnell; im Ruhemodus"
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr "Nicht behandelte Ausnahme"
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr "Untergeordnetes Element %d gestartet"
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr "Starten von %d Workers"
 
-#: quantum/openstack/common/service.py:258
+#: neutron/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:262
+#: neutron/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:266
+#: neutron/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:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "%s abgefangen, untergeordnete Elemente werden gestoppt"
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Warten auf Beenden von %d untergeordneten Elementen"
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 "Es wurde festgestellt, dass keine Verbindung zum mysql-Server mehr "
 "vorhanden ist: %s"
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr "%s nicht in gültigen Prioritäten"
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
@@ -3307,28 +3310,28 @@ msgstr ""
 "Problem %(e)s bei Versuch, an Benachrichtigungssystem zu senden. "
 "Payload=%(payload)s"
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 "Benachrichtigung %s konnte nicht geladen werden. Diese Benachrichtigungen"
 " werden nicht gesendet."
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 "'rabbit_notifier' ist nun veraltet. Verwenden Sie stattdessen "
 "'rpc_notifier'."
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 "Benachrichtigung konnte nicht an %(topic)s gesendet werden. "
 "Payload=%(message)s"
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3339,21 +3342,21 @@ msgstr ""
 "gehaltenen Sperren sind %(locks)s. Dies ist wahrscheinlich ein Fehler. "
 "Melden Sie ihn. Schließen Sie Folgendes ein: [%(stack)s]."
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr "Pool erstellt neue Verbindung"
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, python-format
 msgid ""
 "Number of call waiters is greater than warning threshhold: %d. There "
@@ -3363,75 +3366,75 @@ msgstr ""
 "Warnungsbegrenzung: %d. Möglicherweise gibt es ein Leck in "
 "'MulticallProxyWaiter'."
 
-#: quantum/openstack/common/rpc/amqp.py:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr "Entpackter Kontext: %s"
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr "'UNIQUE_ID' ist %s."
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr "%s erhalten"
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr "Keine Methode für Nachricht: %s"
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr "Keine Methode für Nachricht: %s"
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr "Erwartete Ausnahme bei Nachrichtenbehandlung (%s)"
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr "Ausnahme bei Nachrichtenbehandlung"
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr "Synchroner Aufruf bei %s ..."
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "'MSG_ID' ist %s"
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "Asynchroner Cast bei %s..."
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr "Asynchroner Fan-out-Cast..."
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, 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:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr "Eine unbekannte Ausnahme in Zusammenhang mit RPC ist aufgetreten."
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr "Ausnahme bei Zeichenfolgeformatoperation"
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -3440,36 +3443,36 @@ msgstr ""
 "Ferner Fehler: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, 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:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr "Ungültige Wiederverwendung einer RPC-Verbindung."
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, 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:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
@@ -3478,37 +3481,37 @@ msgstr ""
 "Angegebene RPC-Umschlagsversion %(version)s wird von diesem Endpunkt "
 "nicht unterstützt."
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, 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:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "Ausnahme %s wird an Aufrufenden zurückgegeben"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr "Nachricht konnte nicht verarbeitet werden und wird übersprungen."
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr "Wiederherstellung der Verbindung zu AMQP-Server auf %(hostname)s:%(port)d"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr "Verbunden mit AMQP-Server auf %(hostname)s:%(port)d"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
@@ -3517,7 +3520,7 @@ msgstr ""
 "Herstellen einer Verbindung zu AMQP-Server auf %(hostname)s:%(port)d nach"
 " %(max_retries)d Versuchen nicht möglich: %(err_str)s "
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
@@ -3526,267 +3529,267 @@ msgstr ""
 "AMQP-Server auf %(hostname)s:%(port)d ist nicht erreichbar: %(err_str)s. "
 "Erneuter Versuch in %(sleep_time)d Sekunden."
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr "Consumer konnte nicht deklariert werden für Topic '%(topic)s': %(err_str)s"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr "Zeitlimitüberschreitung beim Warten auf RPC-Antwort: %s"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr "Nachricht aus Warteschlange wurde nicht verarbeitet: %s"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 "Nachricht konnte nicht veröffentlicht werden in Topic '%(topic)s': "
 "%(err_str)s"
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 "Es kann keine Verbindung zum AMQP-Server hergestellt werden: %(e)s. Im "
 "Ruhemodus für %(delay)s Sekunden"
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr "Verbunden mit AMQP-Server auf %s"
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr "AMQP-Warteschlangen erneut erstellt"
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr "Fehler beim Verarbeiten der Nachricht. Wird übersprungen."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr "JSON-Serialisierung fehlgeschlagen. "
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr "Deserialisierung: %s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr "Verbindung zu %(addr)s mit %(type)s wird hergestellt"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr "-> %(subscribe)s abonniert"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr "-> Bindung: %(bind)s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr "Socket konnte nicht geöffnet werden. "
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr "%s wird abonniert"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr "Sie können auf diesem Socket nicht empfangen. "
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr "Sie können auf diesem Socket nicht senden. "
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr "Funktion wird mit Kontext ausgeführt: %s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr "Antwort wird gesendet"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr "RPC-Nachricht hat keine Methode enthalten."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr "Reaktor wird registriert"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr "Eingangsreaktor registriert"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr "Ausgangsreaktor registriert"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr "Socketverwendung"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr "Proxy für Topic wird erstellt: %s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr "Topic enthielt gefährliche Zeichen."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr "Erstellung von Topicsocketdatei fehlgeschlagen."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 "Lokaler topicbezogener Rückstandspuffer für Topic %(topic)s voll. "
 "Nachricht wird gelöscht."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 "ZeroMQ-Empfängerdämon konnte nicht erstellt werden. Socket wird "
 "möglicherweise bereits verwendet. "
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr "CONSUMER HAT DATEN ERHALTEN: %s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr "ROUTER - RELAY-OUT-METHODE FÜR %(data)s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr "ZMQ-Umschlagversion wird nicht unterstützt oder ist unbekannt."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr "Topic-Registrierung wird übersprungen. Bereits registriert."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr "Consumer ist zmq.%s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr "Nutzdaten werden erstellt"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr "Warteschlangensocket für wartenden Antwortthread wird erstellt"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr "Cast wird gesendet"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr "Cast gesendet; es wird auf Antwort gewartet"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr "Nachricht erhalten: %s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr "Antwort wird ausgepackt"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr "Nicht unterstützter oder unbekannter ZMQ-Umschlag wurde zurückgegeben."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr "RPC-Nachricht ungültig."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr "%(msg)s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr "Nachricht(en) werden gesendet an: %s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr "Keine MatchMaker-Ergebnisse. Kein Casting. "
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr "Keine Übereinstimmung von MatchMaker."
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr "Keine Übereinstimmung von MatchMaker gefunden."
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr "MatchMaker implementiert keine Registrierung und kein Überwachungssignal."
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, fuzzy, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr "MatchMaker nicht registriert: %s, %s"
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr "Registrierung vor Start des Überwachungssignals nötig."
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr "Keine schlüsseldefinierenden Hosts für Topic '%s', siehe Ringdatei"
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "Erstellung von Consumerverbindung für Service %s"
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3795,23 +3798,23 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr "Daten beim Herstellen der Verbindung synchronisieren"
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
@@ -3819,11 +3822,11 @@ msgstr ""
 "Maximale Anzahl an Sekunden, die darauf gewartet werden soll, dass eine "
 "Proxy-Anforderung verbunden und abgeschlossen wird."
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
-msgstr "Benutzer hat die ID für diese Quantum-Implementierung definiert"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
@@ -3831,7 +3834,7 @@ msgstr ""
 "Durch Markierung festlegen, ob eine Route zum Metadatenserver in der VM "
 "injiziert werden soll"
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3839,24 +3842,24 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr "Fehler bei REST-Aufruf an Controller von fernem Netz"
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
@@ -3865,25 +3868,25 @@ msgstr ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr "ServerProxy: HTTPS-Verbindung konnte nicht hergestellt werden"
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr "ServerProxy: HTTP-Verbindung konnte nicht hergestellt werden"
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr "ServerProxy: %(action)s fehlgeschlagen, %(e)r"
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
@@ -3892,168 +3895,166 @@ msgstr ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr "Server-Proxy: Fehler bei %(action)s für Server: %(server)r"
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr "ServerProxy: Fehler bei %(action)s für alle Server: %(server)r"
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
-msgstr "QuantumRestProxy: Starten von Plug-in. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
-msgstr "QuantumRestProxyV2: Initialisierung abgeschlossen"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'create_network()'"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
-msgstr "QuantumRestProxyV2: Erstellung von fernem Netz nicht möglich: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
-msgstr "Aufruf von 'QuantumRestProxyV2.update_network()'"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
-msgstr "QuantumRestProxyV2: Aktualisierung von fernem Netz nicht möglich: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'delete_network()'"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'create_port()'"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
-msgstr "QuantumRestProxyV2: Erstellung von fernem Port nicht möglich: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'update_port()'"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'delete_port()'"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
-msgstr "QuantumRestProxyV2: Aktualisierung von fernem Port nicht möglich: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
-msgstr "QuantumRestProxyV2: Aufruf von '_plug_interface()'"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
-msgstr "QuantumRestProxyV2: Aktualisierung von fernem Netz nicht möglich: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
-msgstr "QuantumRestProxyV2: Aufruf von '_unplug_interface()'"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'create_subnet()'"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'update_subnet()'"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'delete_subnet()'"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'create_router()'"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
-msgstr "QuantumRestProxyV2: Erstellung von fernem Router nicht möglich: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
-msgstr "Aufruf von 'QuantumRestProxyV2.update_router()'"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
-msgstr "QuantumRestProxyV2: Aktualisierung von fernem Router nicht möglich: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'delete_router()'"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
-msgstr "QuantumRestProxyV2: Löschen von fernem Router nicht möglich: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'add_router_interface()'"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
-msgstr "QuantumRestProxyV2: Erstellung von Schnittstelle nicht möglich: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'remove_router_interface()'"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
-msgstr "QuantumRestProxyV2: Löschen von ferner Schnittstelle nicht möglich: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'create_floatingip()'"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
-"QuantumRestProxyV2: Erstellung von ferner dynamischer IP-Adresse nicht "
-"möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'update_floatingip()'"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
-msgstr "QuantumRestProxyV2: Aufruf von 'delete_floatingip()'"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
-msgstr "QuantumRestProxy: Aktualisierung von ferner Topologie nicht möglich: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
@@ -4062,7 +4063,7 @@ msgstr ""
 "In dieser Plug-in-Version wird das Einstellen von 'admin_state_up=False' "
 "nicht unterstützt. Einstellungen werden ignoriert für Ressource: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
@@ -4071,228 +4072,228 @@ msgstr ""
 "Der Betriebsstatus wird intern vom Plug-in eingestellt. Die Einstellung "
 "'status=%s' wird ignoriert."
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr "Details für Gerät %(device)s von %(agent_id)s angefordert"
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr "%s kann in Datenbank nicht gefunden werden"
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr "Treiber für Brocade-Netzbetriebssystem:"
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr "Das zugeordnete VLAN (%d) wird in den Pool zurückgegeben"
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr "Zugeordnetes VLAN (%d) aus dem Pool"
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr "Verbindung mit Switch fehlgeschlagen: %s"
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr "Modell %s verwaltet Status"
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr "Plug-in-Initialisierung abgeschlossen"
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr "Aufruf von 'create_network()'"
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr "Aufruf von 'update_network()'"
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr "Aufruf von 'delete_network()'"
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr "Aufruf von 'get_network()'"
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr "Aufruf von 'get_networks()'"
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr "Aufruf von 'create_port()'"
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr "Aufruf von 'delete_port()'"
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr "Aufruf von 'update_port()'"
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr "Aufruf von 'create_subnet()'"
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr "Aufruf von 'update_subnet()'"
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr "Aufruf von 'delete_subnet()'"
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr "Aufruf von 'get_all_qoss()'"
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr "Aufruf von 'get_qos_details()'"
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr "Aufruf von 'create_qos()'"
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr "Aufruf von 'delete_qos()'"
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr "Aufruf von 'rename_qos()'"
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr "Aufruf von 'get_all_credentials()'"
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr "Aufruf von 'get_credential_details()'"
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr "Aufruf von 'create_credential()'"
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr "Aufruf von 'delete_credential()'"
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr "Aufruf von 'rename_credential()'"
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr "Aufruf von 'schedule_host()'"
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr "Aufruf von 'associate_port()'"
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr "Aufruf von 'detach_port()'"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
@@ -4300,7 +4301,7 @@ msgstr ""
 "Operation kann nicht abgeschlossen werden. Keine dynamischen "
 "Netzschnittstellencontroller mehr im System verfügbar."
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
@@ -4309,423 +4310,418 @@ msgstr ""
 "NetworkVlanBinding für %(vlan_id)s und Netz %(network_id)s ist bereits "
 "vorhanden "
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr "VLAN-ID %(vlan_id)s nicht gefunden"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr "Keine VLAN-ID verfügbar"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr "QoS-Stufe %(qos_id)s konnte für Nutzer %(tenant_id)s nicht gefunden werden"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 "QoS-Stufe mit Namen %(qos_name)s für Nutzer %(tenant_id)s bereits "
 "vorhanden"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 "Berechtigungsnachweis %(credential_id)s konnte für Nutzer %(tenant_id)s "
 "nicht gefunden werden"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 "Berechtigungsnachweis %(credential_name)s konnte für Nutzer %(tenant_id)s"
 " nicht gefunden werden"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 "Berechtigungsnachweis %(credential_id)s ist für Nutzer %(tenant_id)s "
 "bereits vorhanden"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr "Port-VNIC-Bindung %(port_id)s ist bereits vorhanden"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr "Port-VNIC-Bindung %(port_id)s ist nicht vorhanden"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr "Port nicht gefunden"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr "Es kann kein Port mit der angegebenen ID gefunden werden."
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr "Berechtigungsnachweis nicht gefunden"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr "Es kann kein Berechtigungsnachweis mit der angegebenen ID gefunden werden."
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr "QoS nicht gefunden"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr "Es kann kein QoS mit der angegebenen ID gefunden werden."
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr "Nova-Nutzer nicht gefunden"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr "Es kann kein Nova-Benutzer mit der angegebenen ID gefunden werden."
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr "Angeforderter Status ungültig"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr "Portstatus kann nicht mit angegebenem Wert aktualisiert werden."
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr "Aufruf von 'create_vlanids()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr "Aufruf von 'get_all_vlanids()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr "Aufruf von 'is_vlanid_used()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr "Aufruf von 'release_vlanid()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr "Aufruf von 'delete_vlanid()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr "Aufruf von 'reserve_vlanid()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr "Aufruf von 'get_all_vlan_bindings()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr "Aufruf von 'get_vlan_binding()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr "Aufruf von 'add_vlan_binding()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr "Aufruf von 'remove_vlan_binding()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr "Aufruf von 'update_vlan_binding()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr "Aufruf von 'get_qos()'"
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr "Aufruf von 'add_qos()'"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr "Aufruf von 'get_all_nexusport_bindings()'"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr "Aufruf von 'get_nexusport_binding()'"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr "Aufruf von 'get_nexusvlan_binding()'"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr "Aufruf von 'add_nexusport_binding()'"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr "Aufruf von 'remove_nexusport_binding()'"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr "Aufruf von 'update_nexusport_binding'"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr "Aufruf von 'get_nexusvm_binding()'"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr "Aufruf von 'get_port_vlan_switch_binding()'"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr "%(module)s. Initialisierung von %(name)s abgeschlossen"
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr "Kein %s-Plug-in geladen"
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr "%(plugin_key)s: %(function_name)s mit Argumenten %(args)s ignoriert"
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr "NexusDriver: %s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr "NexusDriver-VLAN-IDs: %s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr "Treiber %s geladen"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr "Aufruf von 'NexusPlugin:get_all_networks()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr "Aufruf von 'NexusPlugin:create_network()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr "Aufruf von 'NexusPlugin:delete_network()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr "Aufruf von 'NexusPlugin:get_network_details()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr "Aufruf von 'NexusPlugin:update_network()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr "Aufruf von 'NexusPlugin:get_all_ports()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr "Aufruf von 'NexusPlugin:create_port()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr "Aufruf von 'NexusPlugin:delete_port()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr "Aufruf von 'NexusPlugin:update_port()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr "Aufruf von 'NexusPlugin:get_port_details()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr "Aufruf von 'NexusPlugin:plug_interface()'"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr "Aufruf von 'NexusPlugin:unplug_interface()'"
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
@@ -4734,15 +4730,15 @@ msgstr ""
 "Reservierung von VLAN %(vlan_id)s auf physischem Netz "
 "%(physical_network)s von Pool"
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr "Reservierung von einfachem physischem Netz %(physical_network)s von Pool"
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
@@ -4751,27 +4747,27 @@ msgstr ""
 "Reservierung von spezifischem VLAN %(vlan_id)s auf physischem Netz "
 "%(physical_network)s von Pool"
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr "Freigabe von VLAN %(vlan_id)s auf physischem Netz %(physical_network)s"
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 "'vlan_id' %(vlan_id)s auf physischem Netz %(physical_network)s nicht "
 "gefunden"
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
@@ -4780,68 +4776,68 @@ msgstr ""
 "Entfernen von VLAN %(vlan_id)s auf physischem Netz %(physical_network)s "
 "von Pool "
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr "Netztyp für Nutzernetze ('local', 'flat', 'vlan' oder 'none')"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr "Liste mit <physical_network>:<vlan_min>:<vlan_max> oder <physical_network>"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr "'segmentation_id' für %s-Netz angegeben"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr "'physical_network' für %s-Netz angegeben"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr "'physical_network' nicht angegeben"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr "Ungültiger Wert für 'tenant_network_type': %s. Agent beendet!"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "Bereiche für Netz-VLAN: %s"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr "Netztyp %s nicht unterstützt"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr "Erstelltes Netz: %s"
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr "Gerät %(device)s ist nicht mehr auf %(agent_id)s vorhanden"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
@@ -4849,16 +4845,16 @@ msgstr ""
 "Liste mit <physical_network>:<vswitch>, wobei die physischen Netze durch "
 "Wildcards repräsentiert werden können. Beispiel: .\"*:external\""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr "Für lokale Netze verwendeter privater virtueller Switchname"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
@@ -4866,157 +4862,157 @@ msgstr ""
 "Die Anzahl an Sekunden, die der Agent zwischen Abfragen lokaler "
 "Geräteänderungen wartet."
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr "Ungültige Zuordnung von physischem Netz: %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr "'network_delete' erhalten. Löschen von Netz %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr "Netz %s für Agent nicht definiert."
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr "'port_delete' erhalten"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr "'port_update' erhalten"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr "Bereitstellungsnetz %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr "Zurückfordern von lokalem Netz %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr "Binden von Port %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr "Nicht unterstützter Netztyp %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr "Netz %s ist auf diesem Agenten nicht verfügbar"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr "Lösen von Bindung von Port %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr "Kein Port %s für Agent definiert."
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr "Hinzufügen von Port %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr "Port %(device)s aktualisiert. Details: %(device_details)s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr "Entfernen von Port %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr "Agent nicht synchron mit Plug-in!"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr "Agentenschleife umfasst neue Geräte!"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr "Fehler bei Agentenereignisschleife: %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 "Schleifeniteration hat Intervall (%(polling_interval)s contra "
 "%(elapsed)s) überschritten"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr "Agent erfolgreich initialisiert, läuft jetzt... "
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr "HyperVException: %(msg)s"
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr "VNIC nicht gefunden: %s"
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr "Job fehlgeschlagen mit Fehler %d"
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
@@ -5025,27 +5021,27 @@ msgstr ""
 "WMI-Job mit Status %(job_state)d fehlgeschlagen. Fehlerdetails: "
 "%(err_sum_desc)s - %(err_desc)s - Fehlercode: %(err_code)d"
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr "WMI-Job mit Status %(job_state)d fehlgeschlagen. Fehlerdetails: %(error)s"
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr "WMI-Job erfolgreich: %(desc)s, Elapsed=%(elap)s"
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr "Fehler beim Erstellen von Port für %s"
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
@@ -5054,7 +5050,7 @@ msgstr ""
 "Trennen der Verbindung von Port %(switch_port_name)s und Switch "
 "%(vswitch_name)s fehlgeschlagen, Fehler: %(ret_val)s"
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
@@ -5063,102 +5059,102 @@ msgstr ""
 "Löschen des Ports %(switch_port_name)s von Switch %(vswitch_name)s "
 "fehlgeschlagen, Fehler: %(ret_val)s "
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr "vSwitch nicht gefunden: %s"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr "Update für Gerät %(device)s auf %(agent_id)s"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr "Ungültiger Wert für 'tenant_network_type': %s. Service beendet!"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr "Initialisierung von Linux-Brücken-Plug-in abgeschlossen"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr "'provider:network_type' erforderlich"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr "'provider:segmentation_id' für einfaches Netz angegeben"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr "'provider:segmentation_id' erforderlich"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr "'provider:physical_network' für lokales Netz angegeben"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr "'provider:segmentation_id' für lokales Netz angegeben"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr "'provider:network_type' %s nicht unterstützt"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr "Unbekannter Wert für 'provider:physical_network' %s"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr "'provider:physical_network' erforderlich"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr "Ungültige Netz-ID, wird zu falschem Brückennamen führen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr "Ungültige VLAN-ID, wird zu falschem Namen bei Teilschnittstelle führen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr "Ungültige Schnittstellen-ID, wird zu falschem Namen bei TAP-Gerät führen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
@@ -5167,83 +5163,83 @@ msgstr ""
 "Erstellung von Teilschnittstelle %(interface)s für VLAN %(vlan_id)s auf "
 "Schnittstelle %(physical_interface)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr "Erstellung von Teilschnittstelle %s abgeschlossen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr "Starten von Brücke %(bridge_name)s für Teilschnittstelle %(interface)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 "Starten von Brücke %(bridge_name)s für Teilschnittstelle %(interface)s "
 "abgeschlossen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 "Hinzufügen von %(interface)s zu %(bridge_name)s nicht möglich! Ausnahme: "
 "%(e)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr "Keine Zuordnung für physisches Netz %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr "TAP-Gerät: %s ist auf diesem Host nicht vorhanden, wird übersprungen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr "Hinzufügen von Gerät %(tap_device_name)s zu Brücke %(bridge_name)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr "%(tap_device_name)s ist auf Brücke %(bridge_name)s bereits vorhanden"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr "Löschen von Brücke %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr "Löschen von Brücke %s abgeschlossen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr "Brücke %s kann nicht gelöscht werden, da nicht vorhanden"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr "Entfernen von Einheit %(interface_name)s von Brücke %(bridge_name)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 "Entfernen von Einheit %(interface_name)s von Brücke %(bridge_name)s "
 "abgeschlossen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
@@ -5252,136 +5248,136 @@ msgstr ""
 "Einheit %(interface_name)s kann nicht von Brücke %(bridge_name)s entfernt"
 " werden, da nicht vorhanden"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr "Löschen von Teilschnittstelle %s für VLAN"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr "Löschen von Teilschnittstelle %s abgeschlossen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr "'network_delete' erhalten"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr "Anfordern von MAC-Adresse für eindeutige ID nicht möglich. Agent beendet!"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr "RPC-'agent_id': %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr "Port %s hinzugefügt"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr "Abrufen von Portdetails für %(device)s nicht möglich: %(e)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr "Port %(device)s aktualisiert. Details: %(details)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr "Gerät %s nicht für Plug-in definiert"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr "Zusatzeinheit %s entfernt"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr "'port_removed' für %(device)s fehlgeschlagen: %(e)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr "Port %s aktualisiert."
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr "RPC-Dämon für Linux-Brückenagent gestartet!"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr "Aktualisierung der Geräte ist fehlgeschlagen"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr "Fehler bei Agentenschleife. Geräteinfo: %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 "Schleifeniteration hat Intervall (%(polling_interval)s contra "
 "%(elapsed)s) überschritten!"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 "Analysieren von 'physical_interface_mappings' fehlgeschlagen: %s. Agent "
 "beendet!"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr "Schnittstellenzuordnungen: %s"
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr "Netztyp für Nutzernetze ('local', 'vlan' oder 'none')"
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr "Liste mit <physical_network>:<physical_interface>"
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
@@ -5390,9 +5386,9 @@ msgstr ""
 "Reservierung von spezifischem VLAN %(vlan_id)s auf physischem Netz "
 "%(physical_network)s außerhalb des Pools"
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
@@ -5401,9 +5397,9 @@ msgstr ""
 "Freigabe von VLAN %(vlan_id)s auf physischem Netz %(physical_network)s "
 "für Pool "
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
@@ -5412,223 +5408,223 @@ msgstr ""
 "Freigabe von VLAN %(vlan_id)s auf physischem Netz %(physical_network)s "
 "außerhalb des Pools"
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr "Aufruf von 'get_port_from_device()'"
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr "Aufruf, 'set_port_status' als %s festzulegen"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr "Version %(flavor)s konnte nicht gefunden werden"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr "Fehler beim Hinzufügen von Versionsbindung"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr "Initialisierung von Meta-Plug-in starten"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr "'default_flavor' %s ist keine Plug-in-Liste"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr "'default_l3_flavor' %s ist keine Plug-in-Liste"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr "Erstelltes Netz: %(net_id)s mit Version %(flavor)s"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr "Fehler beim Hinzufügen von Versionsbindungen"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr "Erstellter Router: %(router_id)s mit Version %(flavor)s"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr "Erstellter Router: %s"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr "Aktualisierung von Teilnetz fehlgeschlagen: %s"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr "Fernes Teilnetz bereits gelöscht"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr "Aktualisierung von Netz fehlgeschlagen: %s"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr "Fernes Netz bereits gelöscht"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr "Aktualisierung von Port fehlgeschlagen: %s"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr "Ferner Port bereits gelöscht"
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr "Liste zu ladender Plug-ins"
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr "Liste zu ladender Plug-ins der Ebene 3"
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr "Zu verwendende Standardversion"
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr "Zu verwendende Standardversion der Ebene 3"
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr "Unterstützte Erweiterungsaliasnamen"
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr "Eine Liste zu ladender Erweiterungen pro Plug-in."
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr "URI des MidoNet-API-Servers."
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr "Benutzername des MidoNet-Administrators"
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr "Kennwort des MidoNet-Administrators"
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr "ID des Projekts, zu dem der MidoNet-Administrator gehört."
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr "Router-ID des virtuellen Providers."
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr "Router-ID der virtuellen Metadaten."
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr "Betriebsmodus. Nur für interne Entwicklung."
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr "MidoNet %(resource_type)s %(id)s konnte nicht gefunden werden"
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, fuzzy, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 "Aufruf von 'ChainManager.create_for_sg': tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s sg_name=%(sg_name)s "
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, fuzzy, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr "Aufruf von 'MidonetPluginV2.delete_subnet': id=%s"
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, fuzzy, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr "Aufruf von 'MidonetPluginV2.update_router': id=%(id)s router=%(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, fuzzy, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr "Aufruf von 'MidonetPluginV2.delete_router': id=%s"
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, fuzzy, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr "Aufruf von 'MidonetPluginV2.get_port': id=%(id)s fields=%(fields)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, fuzzy, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 "Aufruf von 'ChainManager.create_router_chains': tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, fuzzy, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
@@ -5637,29 +5633,29 @@ msgstr ""
 "Aufruf von 'ChainManager.create_router_chains': tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, fuzzy, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr "Aufruf von 'MidonetPluginV2.update_router': id=%(id)s router=%(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, fuzzy, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr "Aufruf von 'MidonetPluginV2.delete_router': id=%s"
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, fuzzy, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr "Aufruf von 'MidonetPluginV2.get_router': id=%(id)s fields=%(fields)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, fuzzy, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr "Aufruf von 'MidonetPluginV2.update_router': id=%(id)s router=%(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5667,12 +5663,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5680,12 +5676,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr "'route=%r' wird gelöscht ..."
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5693,26 +5689,26 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, fuzzy, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr "Aufruf von 'MidonetPluginV2.update_router': id=%(id)s router=%(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, fuzzy, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
@@ -5721,31 +5717,31 @@ msgstr ""
 "Aufruf von 'ChainManager.get_router_chains': tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, fuzzy, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr "Aufruf von 'MidonetPluginV2.create_router': router=%r"
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, fuzzy, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr "Aufruf von 'MidonetPluginV2.delete_router': id=%s"
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, fuzzy, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr "Aufruf von 'MidonetPluginV2.update_router': id=%(id)s router=%(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5753,7 +5749,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5761,13 +5757,13 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr "'rule=%r' wird gelöscht"
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, fuzzy, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
@@ -5776,7 +5772,7 @@ msgstr ""
 "Aufruf von 'ChainManager.create_for_sg': tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s sg_name=%(sg_name)s "
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, fuzzy, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
@@ -5785,24 +5781,24 @@ msgstr ""
 "Aufruf von 'ChainManager.delete_for_sg': tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s sg_name=%(sg_name)s "
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, fuzzy, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr "ChainManager.delete_for_sg: 'chain=%r' wird gelöscht"
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, fuzzy, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr "ChainManager.delete_for_sg: 'chain=%r' wird gelöscht"
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, fuzzy, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 "Aufruf von 'ChainManager.get_sg_chains': tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, fuzzy, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
@@ -5811,23 +5807,23 @@ msgstr ""
 "Aufruf von 'PortGroupManager.get_for_sg': tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, fuzzy, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr "PortGroupManager.get_for_sg wird beendet: pg=%r"
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, fuzzy, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr "Aufruf von 'RuleManager.create_for_sg_rule': rule=%r"
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 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:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, fuzzy, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
@@ -5836,17 +5832,17 @@ msgstr ""
 "RuleManager.create_for_sg_rule: Bestätigungsregel %(rule_id) in "
 "Portgruppe %(port_group_id)s wird hinzugefügt"
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, fuzzy, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr "Aufruf von 'RuleManager.delete_for_sg_rule': rule=%r"
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, fuzzy, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr "RuleManager.delete_for_sg_rule: Regel '%r' wird gelöscht"
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
@@ -5854,7 +5850,7 @@ msgstr ""
 "Keine Einheiten-IDs für Providerrouter und Metadaten gefunden. Wird "
 "jedoch übersprungen, da die Entwicklungsumgebung ausgeführt wird."
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
@@ -5862,117 +5858,115 @@ msgstr ""
 "'provider_router_id' und 'metadata_router_id' sollten in der "
 "Konfigurationsdatei des Plug-ins konfiguriert werden"
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr "Aufruf von 'MidonetPluginV2.create_subnet': subnet=%r"
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr "MidoNet unterstützt IPv6 nicht."
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr "Mehrere Teilnetze in einem Netz werden von MidoNet nicht unterstützt."
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr "MidonetPluginV2.create_subnet wird beendet: sn_entry=%r"
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr "Aufruf von 'MidonetPluginV2.delete_subnet': id=%s"
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr "MidonetPluginV2.delete_subnet wird beendet"
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr "Aufruf von 'MidonetPluginV2.create_network': network=%r"
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, fuzzy, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr "'admin_state_up=False' für 'network=%rOverriding with True' wird ignoriert"
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr "MidonetPluginV2.create_network wird beendet: net=%r"
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 "Aufruf von 'MidonetPluginV2.update_network': id=%(id)r, "
 "network=%(network)r"
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr "Netze mit 'admin_state_up=False' werden nicht unterstützt."
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr "MidonetPluginV2.update_network wird beendet: net=%r"
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr "Aufruf von 'MidonetPluginV2.get_network': id=%(id)r, fields=%(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr "MidonetPluginV2.get_network wird beendet: qnet=%r"
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr "Aufruf von 'MidonetPluginV2.delete_network': id=%r"
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
-"Die Quantum-Datenbank konnte nicht gelöscht werden; 'bridge=%r' für "
-"MidoNet wurde gelöscht"
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr "Aufruf von 'MidonetPluginV2.create_port': port=%r"
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr "MidonetPluginV2.create_port wird beendet: port_db_entry=%r"
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr "Aufruf von 'MidonetPluginV2.get_port': id=%(id)s fields=%(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr "MidonetPluginV2.get_port wird beendet: port_db_entry=%r"
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 "Aufruf von 'MidonetPluginV2.get_ports': filters=%(filters)s "
 "fields=%(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
@@ -5981,46 +5975,46 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.delete_port': id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr "Aufruf von 'MidonetPluginV2.create_router': router=%r"
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr "MidonetPluginV2.create_router wird beendet: qrouter=%r"
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr "Aufruf von 'MidonetPluginV2.update_router': id=%(id)s router=%(router)r"
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr "Router mit 'admin_state_up=False' werden nicht unterstützt."
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr "MidonetPluginV2.update_router wird beendet: qrouter=%r"
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr "Aufruf von 'MidonetPluginV2.delete_router': id=%s"
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr "MidonetPluginV2.delete_router wird beendet: result=%s"
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
@@ -6029,12 +6023,12 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.add_router_interface': "
 "router_id=%(router_id)s interface_info=%(interface_info)r"
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr "MidonetPluginV2.add_router_interface wird beendet: qport=%r"
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
@@ -6043,11 +6037,11 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.remove_router_interface': "
 "router_id=%(router_id)s interface_info=%(interface_info)r"
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr "MwidonetPluginV2.remove_router_interface wird beendet"
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
@@ -6056,12 +6050,12 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.update_floatingip': id=%(id)s "
 "floatingip=%(floatingip)s "
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr "MidonetPluginV2.update_floating_ip wird beendet: fip=%s"
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
@@ -6070,17 +6064,17 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.create_security_group': "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr "MidonetPluginV2.create_security_group wird beendet: sg_db_entry=%r"
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr "Aufruf von 'MidonetPluginV2.delete_security_group': id=%s"
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
@@ -6089,7 +6083,7 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.get_security_groups': filters=%(filters)r "
 "fields=%(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
@@ -6098,7 +6092,7 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.get_security_group': id=%(id)s "
 "fields=%(fields)r tenant_id=%(tenant_id)s"
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
@@ -6107,17 +6101,17 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.create_security_group_rule': "
 "security_group_rule=%(security_group_rule)r"
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr "MidonetPluginV2.create_security_group_rule wird beendet: rule_db_entry=%r"
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr "Aufruf von 'MidonetPluginV2.delete_security_group_rule': sgrid=%s"
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
@@ -6126,7 +6120,7 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.get_security_group_rules': "
 "filters=%(filters)r fields=%(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
@@ -6135,215 +6129,215 @@ msgstr ""
 "Aufruf von 'MidonetPluginV2.get_security_group_rule': id=%(id)s "
 "fields=%(fields)r"
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, fuzzy, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 "Zurückfordern von unbekanntem Netztyp %(network_type)s für net-"
 "id=%(net_uuid)s nicht möglich"
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, fuzzy, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr "Aufruf von 'get_port_with_securitygroups()': port_id=%s"
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, fuzzy, python-format
 msgid "Loaded type driver names: %s"
 msgstr "Treiber %s geladen"
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, fuzzy, python-format
 msgid "Registered types: %s"
 msgstr "Erstellter Router: %s"
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, fuzzy, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr "Ungültiger Wert für 'tenant_network_type': %s. Service beendet!"
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, fuzzy, python-format
 msgid "Tenant network_types: %s"
 msgstr "Nicht unterstützter Netztyp %s"
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, fuzzy, python-format
 msgid "network_type value '%s' not supported"
 msgstr "Netztyp %s nicht unterstützt"
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, fuzzy, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr "Treiber %s geladen"
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 #, fuzzy
 msgid "Modular L2 Plugin initialization complete"
 msgstr "Plug-in-Initialisierung abgeschlossen"
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, fuzzy, python-format
 msgid "Network %s has no segments"
 msgstr "Netz %s für Agent nicht verwendet."
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 #, fuzzy
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr "'_nvp_delete_port' für Port %(port_id)s in Netz %(net_id)s abgeschlossen"
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, fuzzy, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr "Details für Gerät %(device)s von %(agent_id)s angefordert"
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, fuzzy, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr "Details für Gerät %(device)s von %(agent_id)s angefordert"
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, fuzzy, python-format
 msgid "Returning: %s"
 msgstr "Bereinigung von %s"
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, fuzzy, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr "Gerät %(device)s ist nicht mehr auf %(agent_id)s vorhanden"
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, fuzzy, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr "Update für Gerät %(device)s auf %(agent_id)s"
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, fuzzy, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr "Update für Gerät %(device)s auf %(agent_id)s"
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, fuzzy, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr "Update für Gerät %(device)s auf %(agent_id)s"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, fuzzy, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr "Ungültige Zuordnung von physischem Netz: %s"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 #, fuzzy
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr "Plug-in-Initialisierung abgeschlossen"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 #, fuzzy
 msgid "physical_network required for flat provider network"
 msgstr "'physical_network' für %s-Netz angegeben"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, fuzzy, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr "'physical_network' nicht angegeben"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, fuzzy, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr "Keine Zuordnung für physisches Netz %s"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, fuzzy, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr "Keine Zuordnung für physisches Netz %s"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, fuzzy, python-format
 msgid "No flat network found on physical network %s"
 msgstr "Keine Zuordnung für physisches Netz %s"
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 #, fuzzy
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr "Plug-in-Initialisierung abgeschlossen"
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -6351,44 +6345,44 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 #, fuzzy
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr "Ungültiger Wert für 'tenant_network_type': %s. Service beendet!"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 #, fuzzy
 msgid "VlanTypeDriver initialization complete"
 msgstr "Plug-in-Initialisierung abgeschlossen"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 #, fuzzy
 msgid "physical_network required for VLAN provider network"
 msgstr "'physical_network' für %s-Netz angegeben"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, fuzzy, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr "'physical_network' für %s-Netz angegeben"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 #, fuzzy
 msgid "segmentation_id required for VLAN provider network"
 msgstr "'segmentation_id' für %s-Netz angegeben"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, fuzzy, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 "'%(data)s' befinden sich nicht im Bereich zwischen %(min_value)s und "
 "%(max_value)s"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, fuzzy, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
@@ -6397,382 +6391,382 @@ msgstr ""
 "Entfernen von VLAN %(vlan_id)s auf physischem Netz %(physical_network)s "
 "von Pool "
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, fuzzy, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr "Freigabe von VLAN %(vlan_id)s auf physischem Netz %(physical_network)s"
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr "Fehler in Agentenereignisschleife"
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 "'activate_port_if_ready()': überspringen, 'port.admin_state_up' ist "
 "'False'."
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 "'activate_port_if_ready()': überspringen, 'network.admin_state_up' ist "
 "'False'."
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 "'activate_port_if_ready()': überspringen, keine Portinformationen für "
 "diesen Port."
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 "'activate_port_if_ready()': überspringen, 'ofc_port' ist bereits "
 "vorhanden."
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr "'create_ofc_port()' fehlgeschlagen. Grund: %s"
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr "'delete_ofc_port()' fehlgeschlagen. Grund: %s"
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr "'deactivate_port()': überspringen, 'ofc_port' ist nicht vorhanden."
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr "Aufruf von 'NECPluginV2.create_network()', network=%s ."
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr "'create_network()' fehlgeschlagen. Grund: %s"
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr "Aufruf von 'NECPluginV2.update_network()', id=%(id)s network=%(network)s ."
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr "Aufruf von 'NECPluginV2.delete_network()', id=%s ."
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr "'delete_network()' fehlgeschlagen. Grund: %s"
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr "'delete_ofc_tenant()' fehlgeschlagen. Grund: %s"
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr "Aufruf von 'NECPluginV2.create_port()', port=%s ."
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr "Aufruf von 'NECPluginV2.update_port()', id=%(id)s port=%(port)s ."
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr "Aufruf von 'NECPluginV2.delete_port()', id=%s ."
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
@@ -6780,25 +6774,25 @@ msgstr ""
 "_activate_packet_filter_if_ready(): überspringen, "
 "'packet_filter.admin_state_up' ist 'False'."
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 "'_activate_packet_filter_if_ready()': überspringen, "
 "'network.admin_state_up' ist 'False'."
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 "'_activate_packet_filter_if_ready()': überspringen, ungültiger Wert für "
 "'in_port_id'."
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 "'_activate_packet_filter_if_ready()': überspringen, keine "
 "Portinformationen für 'in_port'."
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
@@ -6806,28 +6800,28 @@ msgstr ""
 "_activate_packet_filter_if_ready(): überspringen, 'ofc_packet_filter' ist"
 " bereits vorhanden."
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr "'create_ofc_packet_filter()' fehlgeschlagen. Grund: %s"
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 "'_deactivate_packet_filter()': überspringen, 'ofc_packet_filter' ist "
 "nicht vorhanden."
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr "'delete_ofc_packet_filter()' fehlgeschlagen. Grund: %s"
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr "Aufruf von 'NECPluginV2.create_packet_filter()', packet_filter=%s ."
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
@@ -6836,12 +6830,12 @@ msgstr ""
 "Aufruf von 'NECPluginV2.update_packet_filter()', id=%(id)s "
 "packet_filter=%(packet_filter)s."
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr "Aufruf von 'NECPluginV2.delete_packet_filter()', id=%s ."
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
@@ -6850,19 +6844,19 @@ msgstr ""
 "Aufruf von 'NECPluginV2RPCCallbacks.get_port_from_device()', "
 "device=%(device)s => %(ret)s."
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr "Aufruf von 'NECPluginV2RPCCallbacks.update_ports()', kwargs=%s ."
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6870,256 +6864,187 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr "Aktualisieren von Ports: added=%(added)s, removed=%(removed)s"
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr "'update_ports()' fehlgeschlagen."
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr "'port_update' empfangen: %s"
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr "Kein Port geändert."
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr "Zu verwendende Integrationsbrücke"
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr "Host, zu dem eine Verbindung hergestellt werden soll"
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr "Port, zu dem eine Verbindung hergestellt werden soll"
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr "Zu verwendender Treiber"
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr "Paketfilter aktivieren"
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr "SSL zum Herstellen einer Verbindung verwenden"
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr "Schlüsseldatei"
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr "Zertifikatsdatei"
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr "Eine OFC-Ausnahme ist aufgetreten: %(reason)s"
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr "In NECPluginV2-Datenbank ist eine Ausnahme aufgetreten: %(reason)s"
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
-msgstr "Konsistenz von Quantum-OFC-Ressourcenzuordnung ist beschädigt: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
+msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr "PortInfo %(id)s konnte nicht gefunden werden"
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr "PacketFilter %(id)s konnte nicht gefunden werden"
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr "Clientanforderung: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr "OFC-Rückgaben [%(status)s:%(data)s]"
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr "Eine Operation für OFC ist fehlgeschlagen."
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr "Verbindung zu OFC fehlgeschlagen: %s"
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr "'_del_ofc_item()': NotFound-Element (model=%(model)s, id=%(id)s) "
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
-msgstr "NotFound-%(resource)s für quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
+msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr "_del_ofc_item(): NotFound-Element (resource=%(resource)s, id=%(id)s) "
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr "'del_portinfo()': NotFound-Portinfo für port_id: %s"
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr "Aufruf von 'get_port_with_securitygroups()': port_id=%s"
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr "Laden von OFC-Treiber: %s"
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 "Anzahl an zulässigen Werten für 'packet_filters' pro Nutzer, -1 für "
 "unbegrenzt"
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr "NVP-Version kann aus den Antwortheadern nicht abgerufen werden: %s"
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr "'NVPApiHelper.request()' gibt \"%s\" zurück"
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr "Anforderung hat zulässiges Zeitlimit überschritten: %(method)s an %(url)s"
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr "Empfangener Fehlercode: %s"
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr "Serverfehlernachricht: %s"
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-"%(method)s an %(url)s, unerwarteter Antwortcode: %(status)d (Inhalt = "
-"'%(body)s')"
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr "Server hat Authentifizierungsnachweise der Sitzung zurückgewiesen."
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr "Eine in der Anforderung referenzierte Entität wurde nicht gefunden."
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr "Anforderung kollidiert mit Konfiguration auf einer anderen Entität."
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-"Anforderung konnte nicht abgeschlossen werden, da die zugeordnete "
-"Ressource nicht zu erreichen war."
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr "Der Anforderung wird der Zugang zur referenzierten Ressource verweigert."
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr "Die Anforderung hat das zulässige Zeitlimit überschritten."
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, 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:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr "NVP-Routerport erstellt: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, 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:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 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:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, 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:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
-"Verbinden der Zusatzeinheit mit Port des logischen NVP-Routers "
-"%(r_port_id)s, der Quantum %(q_port_id)s zugeordnet ist, ist nicht "
-"möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 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:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, python-format
 msgid ""
 "NVP plugin does not support regular VIF ports on external networks. Port "
@@ -7128,9 +7053,9 @@ msgstr ""
 "Das NVP-Plug-in unterstützt keine VIF-Standardports in externen Netzen. "
 "Port %s wird inaktiv sein."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, python-format
 msgid ""
 "_nvp_create_port completed for port %(name)s on network %(network_id)s. "
@@ -7139,28 +7064,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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, 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:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, 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:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, 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:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr "Port %s in NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
@@ -7169,7 +7094,7 @@ msgstr ""
 "Ausnahme wird ignoriert, da dies bedeutet, dass der Peer für Port '%s' "
 "bereits gelöscht wurde."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
@@ -7178,7 +7103,7 @@ msgstr ""
 "Die Erstellung von Routerschnittstellenports in externen Netzen wie %s "
 "ist nicht zulässig"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, python-format
 msgid ""
 "device_id field must be populated in order to create an external gateway "
@@ -7187,12 +7112,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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
@@ -7201,19 +7126,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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, 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:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr "Logischer Router kann auf der NVP-Plattform nicht aktualisiert werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, python-format
 msgid ""
 "_nvp_delete_ext_gw_port completed on external network %(ext_net_id)s, "
@@ -7222,46 +7147,46 @@ 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
-msgstr "NVP-UUID für Quantum-Port %s kann nicht gefunden werden"
+msgid "Unable to find NVP uuid for Neutron port %s"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr "%s erforderlich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 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:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr "Segmentations-ID muss bei VLAN-Netztyp angegeben werden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, 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:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, 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:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, 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:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not yet supported by this plugin. "
@@ -7270,156 +7195,144 @@ 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, 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"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr "'delete_network' für Nutzer abgeschlossen: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr "Es wurde kein lSwitch %s in NVP gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
-"Aktueller Netzstatus: %(nvp_net_status)s; Status in der Quantum-"
-"Datenbank: %(quantum_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr "Abrufen logischer Switches nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
-"Logischer Switch %s wurde in Quantum-Datenbank gefunden, aber nicht in "
-"NVP. "
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 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:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr "'get_networks()' für Nutzer %s abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr "LSwitch %s in NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr "Abrufen von Ports nicht möglich"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
-msgstr "Logischer Quantum-Port %s wurde auf NVP nicht gefunden"
+msgid "Neutron logical port %s was not found on NVP"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 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:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 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:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, 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:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr "Portanforderung aktualisieren: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, 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:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 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:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, 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:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 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:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, 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:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 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:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
-"Aktueller Routerstatus: %(router_status)s; Status in der Quantum-"
-"Datenbank: %(db_router_status)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 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:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 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:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
@@ -7428,7 +7341,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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
@@ -7437,7 +7350,7 @@ msgstr ""
 "'Add_router_interface' für Teilnetz: %(subnet_id)s und Router: "
 "%(router_id)s abgeschlossen"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, python-format
 msgid ""
 "The port %(port_id)s, connected to the router %(router_id)s was not found"
@@ -7446,24 +7359,21 @@ msgstr ""
 "Port %(port_id)s, verbunden mit Router %(router_id)s, wurde auf der Back-"
 "End-NVP nicht gefunden"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
-"Port für den logischen Router von NVP konnte für Quantum-Port-ID nicht "
-"gefunden werden: %s. War dieser Ports jemals paarweise mit einem "
-"logischen Router verbunden?"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, 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:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
@@ -7472,18 +7382,18 @@ msgstr ""
 "Fehler beim Entfernen von NAT-Regeln auf der NVP-Plattform für dynamische"
 " IP-Adresse: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 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:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, 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:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, python-format
 msgid ""
 "An error occurred while creating NAT rules on the NVP platform for "
@@ -7493,17 +7403,17 @@ msgstr ""
 " IP-Adresse: %(floating_ip)s, zugeordnet zu interner IP-Adresse: "
 "%(internal_ip)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, 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:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
@@ -7512,7 +7422,7 @@ msgstr ""
 "'Create_l2_gw_service' hat keine UUID für die neu erstellte Ressource "
 "zurückgegeben: %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
@@ -7520,102 +7430,160 @@ msgstr ""
 "Gateway-Service kann von der NVP-Plattform nicht entfernt werden - die "
 "Ressource wurde nicht gefunden"
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr "NVP-Version kann aus den Antwortheadern nicht abgerufen werden: %s"
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr "'NVPApiHelper.request()' gibt \"%s\" zurück"
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr "Anforderung hat zulässiges Zeitlimit überschritten: %(method)s an %(url)s"
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr "Empfangener Fehlercode: %s"
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr "Serverfehlernachricht: %s"
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+"%(method)s an %(url)s, unerwarteter Antwortcode: %(status)d (Inhalt = "
+"'%(body)s')"
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr "Server hat Authentifizierungsnachweise der Sitzung zurückgewiesen."
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr "Eine in der Anforderung referenzierte Entität wurde nicht gefunden."
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr "Anforderung kollidiert mit Konfiguration auf einer anderen Entität."
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+"Anforderung konnte nicht abgeschlossen werden, da die zugeordnete "
+"Ressource nicht zu erreichen war."
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr "Der Anforderung wird der Zugang zur referenzierten Ressource verweigert."
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr "Die Anforderung hat das zulässige Zeitlimit überschritten."
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 "Angegebener Name: '%s' überschreitet die maximale Länge. Er wird auf NVP "
 "abgeschnitten"
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr "Clusterversion von NVP-Controller: %s"
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr "Logischer Switch %s erstellt"
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr "Netz nicht gefunden. Fehler: %s"
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
-"Suche nach Ports mit dem 'q_port_id'-Tag '%(quantum_port_id)s' auf: "
-"'%(lswitch_uuid)s'"
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
-"'%(num_ports)d' Ports mit 'q_port_id'-Tag: '%(quantum_port_id)s' "
-"gefunden. Nur einer wurde erwartet."
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr "get_port() %(network)s %(port)s"
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr "Port oder Netz nicht gefunden. Fehler: %s"
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr "Logischer Port %(result)s auf logischem Switch %(uuid)s erstellt"
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 "Logischer Port %(lport_uuid)s auf logischem Router %(lrouter_uuid)s wurde"
 " erstellt"
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 "Logischer Port %(lport_uuid)s auf logischem Router %(lrouter_uuid)s wurde"
 " aktualisiert"
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
@@ -7624,37 +7592,37 @@ msgstr ""
 "Port %(lport_uuid)s des logischen Routers auf logischem Router "
 "%(lrouter_uuid)s löschen"
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr "Ungültiger Typ der NVP-Zusatzeinheit '%s'"
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr "Port nicht gefunden. Fehler: %s"
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr "Sicherheitsprofil erstellt: %s"
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr "Sicherheitsprofil aktualisiert: %s"
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr "Ungültige Schlüssel für NAT-Übereinstimmung: %s"
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr "NAT-Regel wird erstellt: %s"
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
@@ -7662,12 +7630,12 @@ msgstr ""
 "Regeln vom Typ 'No SNAT' können nicht angewendet werden, da sie in dieser"
 " Version der NVP-Plattform nicht verfügbar sind"
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr "Router-Port %(lport_id)s auf Router %(lrouter_id)s nicht gefunden"
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
@@ -7676,39 +7644,39 @@ msgstr ""
 "Ausnahme beim Aktualisieren der IP-Adressen auf einem logischen Router-"
 "Port: %s"
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr "Fehler beim Erstellen der logischen Warteschlange"
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr "Fehler beim Löschen der logischen Warteschlange"
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr "[%d] Derzeit keine API-Provider verfügbar."
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr "[%d] Warten auf Herstellung von Verbindung zu API-Client."
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 "[%(rid)d] Verbindung %(conn)s %(sec)0.2f Sekunden inaktiv; Verbindung "
 "wird wiederhergestellt."
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 "[%(rid)d] Verbindung %(conn)s hergestellt. %(qsize)d Verbindung(en) "
 "verfügbar."
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
@@ -7717,157 +7685,157 @@ msgstr ""
 "[%(rid)d] Freigegebene Verbindung %(conn)s ist kein API-Provider für den "
 "Cluster "
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 "[%(rid)d] Verbindung in fehlerhaftem Zustand zurückgegeben, Verbindung zu"
 " %(conn)s wird wiederhergestellt"
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 "[%(rid)d] Verbindung %(conn)s freigegeben. %(qsize)d Verbindung(en) "
 "verfügbar."
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr "Anmeldeanforderung für ungültige Verbindung: '%s'"
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr "Warten auf Abschluss von Authentifizierung"
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr "Ungültiger Wert für 'conn_params': '%s'"
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr "NvpApiClient: Anmeldefehler \"%s\""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr "Speichern von neuem Authentifizierungscookie '%s'"
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr "'_conn_str()' ungültiger Verbindungstyp: %s"
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr "Keine API-Verbindungen verfügbar"
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr "[%(rid)d] Ausgabe - Anforderung %(conn)s"
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr "Festlegen von Anforderungsheader 'X-Nvp-Wait-For-Config-Generation': '%s'"
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr "[%(rid)d] Ausnahme bei Ausgabe von Anforderung: %(e)s"
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 "[%(rid)d] Abgeschlossene Anforderung '%(conn)s': %(status)s (%(sec)0.2f "
 "Sekunden)"
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr "Lesen von 'X-Nvp-config-Generation'-Antwortheader: '%s'"
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 "[%d] Höchstanzahl an Weiterleitungen überschritten, Anforderung wird "
 "abgebrochen"
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr "[%(rid)d] Weiterleitung von Anforderung an: %(conn)s"
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr "[%(rid)d] Anforderung '%(method) %(url)s' erhalten: %(status)s"
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr "Serverfehler zurückgegeben: %s"
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr "Ungültige Serverantwort"
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 "[%(rid)d] Fehlgeschlagene Anforderung '%(conn)s': '%(msg)s' (%(sec)0.2f "
 "Sekunden)"
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr "[%d] Umleitungsstatus ohne Positionsheaderfeld erhalten"
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr "[%(rid)d] Ungültige Umleitungsposition erhalten: '%(url)s'"
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr "[%(rid)d] Fehlerhafte Umleitungsposition erhalten: '%(url)s'"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr "Verknüpfen von ungültigem grünem Thread"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr "[%d] Anforderungs-Zeitlimitüberschreitung."
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr "Anforderungs-Zeitlimitüberschreitung"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr "[%(rid)d] Anforderung '%(method)s %(url)s' abgeschlossen: %(status)s"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr "[%(rid)d] Fehler bei Verarbeitung von Anforderung: %(req)s"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr "[%(rid)d] Fehler bei Analyse von API-Provider: %(e)s"
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
@@ -7875,7 +7843,7 @@ msgstr ""
 "Maximale Anzahl an Ports eines logischen Switchs auf einer überbrückten "
 "Transportzone (Standard 64)"
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
@@ -7883,11 +7851,11 @@ msgstr ""
 "Maximale Anzahl an Ports eines logischen Switchs auf einer Overlay-"
 "Transportzone (Standard 64)"
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr "Maximale Anzahl gleichzeitig bestehender Verbindungen"
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
@@ -7895,68 +7863,63 @@ msgstr ""
 "Anzahl an Sekunden, für die eine Erstellungs-ID gültig sein sollte "
 "(Standard -1 bedeutet kein Zeitlimit)"
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
-"Aktiviert die dedizierte Verbindung mit dem Metadaten-Proxy für den "
-"Metadatenserverzugriff über den Quantum-Router"
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
-"Dies ist die UUID der Standard-NVP-Transportzone, die zur Erstellung "
-"getunnelter isolierter \"Quantum\"-Netze verwendet wird. Sie muss in NVP "
-"erstellt werden, bevor Quantum mit dem NVP-Plug-in gestartet wird."
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
@@ -7964,7 +7927,7 @@ msgstr ""
 "Optionaler Parameter zur Bestimmung der UUID des Clusters in NVP. Er kann"
 " vom Abschnitt \"admin\" der NVP-Managementkonsole abgerufen werden."
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
@@ -7972,7 +7935,7 @@ msgstr ""
 "Eindeutige ID des L3-Gateway-Service von NVP, die für die Implementierung"
 " von Routern und dynamischen IP-Adressen verwendet wird"
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
@@ -7980,7 +7943,7 @@ msgstr ""
 "Eindeutige ID des L2-Gateway-Service von NVP, die standardmäßig für "
 "Netzgateways verwendet wird"
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
@@ -7988,38 +7951,38 @@ msgstr ""
 "Name der Schnittstelle auf einem Transportknoten des L2-Gateways, der "
 "standardmäßig beim Einrichten einer Netzverbindung verwendet werden soll"
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr "Unerwarteter Fehler im NVP-Plug-in:%(err_msg)s"
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr "Ungültige NVP-Verbindungsparameter: %(conn_params)s"
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 "Clusterkonfigurationseintrag für Nova-Zone %(nova_zone)s kann nicht "
 "gefunden werden"
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
@@ -8028,7 +7991,7 @@ msgstr ""
 "Port kann in Netz %(network)s nicht erstellt werden. Maximale Anzahl an "
 "Ports erreicht"
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
@@ -8038,7 +8001,7 @@ msgstr ""
 "verbunden werden. Diese Schnittstelle ist bereits mit Port "
 "%(att_port_id)s verbunden"
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
@@ -8047,11 +8010,11 @@ msgstr ""
 "Beim Abrufen von NAT-Regeln wurden %(actual_rules)s gefunden, erwartet "
 "wurden hingegen Regeln im Bereich (%(min_rules)s,%(max_rules)s)"
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr "Das Metadatenzugriffsnetz ist inaktiviert"
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
@@ -8059,7 +8022,7 @@ msgstr ""
 "Sich überschneidende IP-Adressen müssen aktiviert werden, um das "
 "Metadatenzugriffsnetz einzurichten"
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
@@ -8068,23 +8031,21 @@ msgstr ""
 "Keine Routerschnittstelle für Router '%s' gefunden. Kein "
 "Metadatenzugriffsnetz sollte erstellt oder gelöscht werden"
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr "Fehler beim Arbeiten im Metadatenzugriffsnetz für Router: '%s'"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
-"Netzgateway '%(gateway_id)s' hat noch aktive Zuordnungen zu mindestens "
-"einem Quantum-Netz."
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
@@ -8093,7 +8054,7 @@ msgstr ""
 "Port '%(port_id)s' ist Eigentum von '%(device_owner)s' und kann daher "
 "nicht direkt über die Port-API gelöscht werden."
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
@@ -8102,7 +8063,7 @@ msgstr ""
 "Die angegebene Zuordnung '%(mapping)s' wird auf dem Netzgateway "
 "'%(gateway_id)s' bereits verwendet."
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
@@ -8111,7 +8072,7 @@ msgstr ""
 "Mehrere Netzverbindungen auf '%(gateway_id)s' mit angegebenen Kriterien "
 "gefunden."
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
@@ -8120,14 +8081,14 @@ msgstr ""
 "Die Verbindung %(network_mapping_info)s wurde auf den Netzgateway "
 "'%(network_gateway_id)s' nicht gefunden"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 "Das Netzgateway %(gateway_id)s kann nicht aktualisiert oder gelöscht "
 "werden"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
@@ -8135,7 +8096,7 @@ msgstr ""
 "Eine Netz-ID muss bei Verbindung eines Netzes mit einem Netzgateway "
 "angegeben werden. Operation kann nicht abgeschlossen werden"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
@@ -8144,7 +8105,7 @@ msgstr ""
 "Ungültige Schlüssel unter den im Anforderungshauptteil angegebenen "
 "gefunden: %(connection_attrs)s."
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
@@ -8152,33 +8113,33 @@ msgstr ""
 "Damit eine Segmentierungs-ID angegeben werden kann, muss auch der "
 "Segmentierungstyp angegeben werden"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 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/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr "Netzgateway mit ID erstellt: %s"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr "Netzgateway mit ID aktualisiert: %s"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr "Netzgateway '%s' gelöscht."
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, 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/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, python-format
 msgid ""
 "Requested network '%(network_id)s' not found.Unable to create network "
@@ -8187,7 +8148,7 @@ msgstr ""
 "Angefordertes Netz '%(network_id)s' nicht gefunden. Netzverbindung auf "
 "Gateway '%(network_gateway_id)s' kann nicht erstellt werden"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
@@ -8196,180 +8157,180 @@ msgstr ""
 "Gateway-Port für '%(network_gateway_id)s' in Netz '%(network_id)s' "
 "erstellt: %(port_id)s"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, 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/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr "Netz '%(network_id)s' wird von Gateway '%(network_gateway_id)s' getrennt"
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/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"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 "Zum Erstellen einer Warteschlange mit dem Namen 'default' sind "
 "Administratorrechte erforderlich"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr "Eine Warteschlange mit dem Namen 'default' ist bereits vorhanden."
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr "Ungültiger Wert für DSCP; %(data)s muss eine Ganzzahl sein."
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr "Ungültige Bandbreitengeschwindigkeit, 'min' ist größer als 'max'."
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 "Ungültige Bandbreitengeschwindigkeit; %(data)s muss eine nicht negative "
 "Ganzzahl sein."
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 "Kein DSCP-Feld nötig, wenn der QoS-Workload als vertrauenswürdig markiert"
 " ist"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr "Warteschlange %(id)s ist nicht vorhanden"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr "Die dem Port angehängte Warteschlange kann nicht gelöscht werden."
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr "Port ist 'lqueue' nicht zugeordnet"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr "'%s' muss eine nicht negative Ganzzahl sein."
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 "Unverhältnismäßiger Tunnel-ID-Bereich %(tun_min)s:%(tun_max)s wird "
 "übersprungen"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr "Entfernen von Tunnel %s aus Pool"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr "Reservieren von Tunnel %s aus Pool"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr "Reservieren eines bestimmten Tunnels %s aus Pool"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr "Reservieren eines bestimmten Tunnels %s außerhalb des Pools"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr "Freigabe von Tunnel %s außerhalb des Pools"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr "Freigabe von Tunnel %s an Pool"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr "'tunnel_id' %s nicht gefunden"
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr "Update für Gerät %(device)s auf %(agent_id)s"
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr "Tunnel-ID-Bereiche: %s"
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr "Netz %s für Agent nicht verwendet."
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr "'tunnel_update' erhalten"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr "Keine lokale VLAN-Adresse für net-id=%s verfügbar"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr "Zuweisung von %(vlan_id)s als lokale VLAN-Adresse für net-id=%(net_uuid)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
@@ -8378,7 +8339,7 @@ msgstr ""
 "Bereitstellung von einfachem Netz für net-id=%(net_uuid)s nicht möglich -"
 " keine Brücke für 'physical_network' %(physical_network)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
@@ -8387,7 +8348,7 @@ msgstr ""
 "Bereitstellung von VLAN-Netz für net-id=%(net_uuid)s nicht möglich - "
 "keine Brücke für 'physical_network' %(physical_network)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
@@ -8396,12 +8357,12 @@ msgstr ""
 "Bereitstellung von unbekanntem Netztyp %(network_type)s für net-"
 "id=%(net_uuid)s nicht möglich"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr "Zurückfordern von vlan = %(vlan_id)s von net-id = %(net_uuid)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
@@ -8410,17 +8371,17 @@ msgstr ""
 "Zurückfordern von unbekanntem Netztyp %(network_type)s für net-"
 "id=%(net_uuid)s nicht möglich"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr "'port_unbound()' 'net_uuid' %s nicht in 'local_vlan_map'"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr "port_unbound: 'vif_id' %s nicht in 'local_vlan_map'"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
@@ -8430,12 +8391,12 @@ msgstr ""
 "Agenten nicht aktiviert sein, da diese OVS-Version Tunnel und Patch-Ports"
 " nicht unterstützt. Agent beendet!"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr "Zuordnung von physischem Netz %(physical_network)s zu Brücke %(bridge)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
@@ -8444,223 +8405,217 @@ msgstr ""
 "Brücke %(bridge)s für physisches Netz %(physical_network)s ist nicht "
 "vorhanden. Agent beendet!"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr "Kein VIF-Port für Port %s für Agent definiert."
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr "Tunnel-IP %(local_ip)s kann nicht synchronisiert werden: %(e)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr "Agententunnel nicht synchron mit Plug-in!"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr "Analysieren von 'bridge_mappings' fehlgeschlagen: %s."
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr "%s-Agent beendet!"
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr "Tunnelungsunterstützung aktivieren"
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr "Zu verwendende Tunnelbrücke"
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr "Peer-Patch-Port in Integrationsbrücke für Tunnelbrücke"
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr "Peer-Patch-Port in Tunnelbrücke für Integrationsbrücke"
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr "Lokale IP-Adresse von GRE-Tunnel-Endpunkten."
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr "Liste mit <physical_network>:<bridge>"
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr "Liste mit <tun_min>:<tun_max>"
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr "Unerwarteter Fehler im PLUMgrid-Plug-in: %(err_msg)s"
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr "Verbindung mit PLUMgrid-NOS fehlgeschlagen: %(err_msg)s"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
-"Status von 'QuantumPluginPLUMgrid': Erstellung von Nachrichtendaten für "
-"NOS"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr "PLUMgrid-NOS-Server, zu dem eine Verbindung hergestellt werden soll"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr "PLUMgrid-NOS-Server-Port, zu dem eine Verbindung hergestellt werden soll"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr "Benutzername des PLUMgrid-NOS-Administrators"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr "Kennwort des PLUMgrid-NOS-Administrators"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr "Zeitlimit des PLUMgrid-NOS-Servers"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr "Name der PLUMgrid-NOS-Topologie"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
-msgstr "Status von 'QuantumPluginPLUMgrid': Plug-in wird gestartet"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
-msgstr "Status von 'QuantumPluginPLUMgrid': Plug-in wird beendet"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
-msgstr "QuantumPluginPLUMgrid-NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
-"Status von 'QuantumPluginPLUMgrid': NOS-Wert fehlt in der "
-"Konfigurationsdatei"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
-"Status von 'QuantumPluginPLUMgrid': Quantum-Server mit PLUMgrid-Plug-in "
-"wurde gestartet"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
-msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'create_network()'"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr "Fehler bei PLUMgrid-NOS-Kommunikation"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
-msgstr "Aufruf von 'QuantumPluginPLUMgridV2.update_network()'"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
-msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'delete_network()'"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
-msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'create_port()'"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
-msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'update_port()'"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
-msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'delete_port()'"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
-msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'create_subnet()'"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr "Fehler bei PLUMgrid-NOS-Kommunikation:"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
-msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'delete_subnet()'"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
@@ -8669,108 +8624,108 @@ 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/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr "Fehler beim Überprüfen des Status vom Netzadministrator:"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
-msgstr "Status von 'QuantumPluginPLUMgrid': REST-Verbindung wurde gestartet"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr "PLUMgrid_NOS_Server: HTTP-Verbindung konnte nicht aufgebaut werden"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr "Verbindungsantwort von 'PLUMgrid_NOS_Server': %s"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr "PLUMgrid-HTTP-Verbindung fehlgeschlagen:"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr "PLUMgrid_NOS_Server: %(action)s fehlgeschlagen, %(e)r"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr "get_ofp_rest_api: %s"
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr "Ungültige Konfiguration. 'ryu.ini' überprüfen"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr "Externer Port %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr "REST-API-Adresse für Ryu abrufen"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr "REST-API-Port für Ryu ist nicht angegeben"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr "Wechsel in OFP-Controllermodus %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr "Portaktualisierung empfangen"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr "Agentenschleife umfasst ein neues Gerät"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr "tunnel_ip %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr "ovsdb_port %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr "ovsdb_ip %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr "Initialisierung fehlgeschlagen: %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
@@ -8778,44 +8733,44 @@ msgstr ""
 "Ryu-Initialisierung auf Knoten abgeschlossen. Agent erfolgreich "
 "initialisiert, läuft jetzt..."
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr "Position von OpenFlow-REST-API"
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr "Zu verwendende Mindest-Tunnel-ID"
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr "Zu verwendende Maximal-Tunnel-ID"
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr "Zu verwendende Tunnel-IP"
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr "Zu verwendende Tunnelschnittstelle"
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr "OVSDB-Port, zu dem eine Verbindung hergestellt werden soll"
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr "OVSDB-IP-Adresse, zu der eine Verbindung hergestellt werden soll"
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr "OVSDB-Schnittstelle, zu der eine Verbindung hergestellt werden soll"
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr "Aufruf von 'get_port_from_device()': port_id=%s"
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
@@ -8824,204 +8779,201 @@ msgstr ""
 "Ungültige Tunnelschlüsseloptionen 'tunnel_key_min': %(key_min)d "
 "tunnel_key_max: %(key_max)d. Verwendung des Standardwertes"
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr "'last_key' %(last_key)s 'new_key' %(new_key)s"
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr "Kein Schlüssel gefunden"
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 "Wiederholungslimit für Neuversuch von Transaktion erreicht (%d). "
 "Tunnelschlüsselzuordnung abgebrochen."
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr "Zu verwendender Treiber bei Netzzuordnung zum DHCP-Agenten"
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr "Zu verwendender Treiber bei Routerzuordnung zum Standard-L3-Agenten"
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr "Automatische Netzzuordnung zum DHCP-Agenten zulassen."
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr "Automatische Routerzuordnung zum L3-Agenten zulassen."
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr "DHCP-Agent %(agent_id)s ist Netz %(network_id)s als Host zugeordnet"
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr "Netz %s wird bereits gehostet"
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr "DHCP-Agent %s ist nicht aktiv"
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr "Keine nicht gehosteten Netze"
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr "Kein aktivierter L3-Agent auf Host %s"
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr "L3-Agent %s ist nicht aktiv"
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr "Router %(router_id)s wurde bereits vom L3-Agenten %(agent_id)s gehostet"
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr "Keine nicht gehosteten Router"
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr "Keine mit L3-Agent kompatiblen Router auf Host %s"
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr "Keine aktiven L3-Agenten"
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr "Keine L3-Agenten können Router %s hosten"
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr "Router %(router_id)s ist L3-Agent %(agent_id)s zugeordnet"
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
-"FEHLER: Konfigurationsdatei kann über die Standardsuchpfade (~/.quantum/,"
-" ~/, /etc/quantum/, /etc/) und über die Option '--config-file' nicht "
-"gefunden werden!"
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr "FEHLER: %s"
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr "Sekunden zwischen Ausführungen regelmäßig wiederkehrender Tasks"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr "Der für die Verwaltung der Lastverteilung verwendete Treiber."
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr "Position zum Speichern der Konfigurations- und Statusdateien"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr "Der für die Verwaltung der virtuellen Schnittstelle verwendete Treiber"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr "Die Benutzergruppe"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr "Fehler beim Importieren von Schnittstellentreiber: %s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr "Fehler beim Importieren von Lastverteilungstreiber: %s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr "Fehler beim Aktualisieren der Statistiken"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr "Abrufen von bereiten Einheiten nicht möglich"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr "Einheit für Pool kann nicht aktualisiert werden: %s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr "Einheit für Pool kann nicht gelöscht werden: %s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr "Fehler beim Versuch, mit Statistiksocket zu verbinden: %s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr "Statistiksocket für Pool nicht gefunden: %s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr "HAProxy-Prozess kann nicht beendet werden: %s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr "Aktiver Pool und aktive VIP erwartet"
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr "Zu verbindender Port %s kann nicht gefunden werden."
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
@@ -9030,35 +8982,498 @@ msgstr ""
 "Zu entfernender Port %s kann nicht gefunden werden. Dies kann auftreten, "
 "wenn die VIP zuerst gelöscht wurde."
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr "lSwitch: %s nicht gefunden"
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr "lRouter: %s nicht gefunden"
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr "Quantum-'core_plugin' nicht konfiguriert!"
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+#~ "Plug-in nicht gefunden. Sie können "
+#~ "ein Plug-in mit folgendem Befehl "
+#~ "installieren: pip install <plugin-name>\n"
+#~ ""
+#~ "Beispiel: pip install quantum-sample-plugin"
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr "In 'WsgiService.create()'"
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr "Quantum-Service gestartet, empfangsbereit auf %(host)s:%(port)s"
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+#~ "Der Quantum-Server unterstützt keine "
+#~ "Statusberichte. Statusberichte für diesen "
+#~ "Agenten werden inaktiviert."
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr "Von Quantum-Metadaten-Namensbereichsproxy verwendeter TCP-Port."
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+#~ "'True' zum Löschen aller Ports auf "
+#~ "den OpenvSwitch-Brücken. 'False' zum "
+#~ "Löschen von Ports, die von Quantum "
+#~ "auf Integrationsbrücken und externen "
+#~ "Netzbrücken erstellt wurden."
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr "Kern-Plug-in, das Quantum verwenden wird"
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr "Service-Plug-ins, die Quantum verwenden wird"
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr "Basis-MAC-Adresse, die Quantum für VIFs verwenden wird"
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr "Wie oft Quantum die MAC-Adressenerstellung erneut versuchen wird"
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr "Überschneidung bei IP-Support in Quantum zulassen"
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr "Name von Host, auf dem Quantum ausgeführt wird"
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+#~ "Datensatz für Standardservicetyp in "
+#~ "Quantum-Datenbank aktualisiert. ID ist "
+#~ "'%s'."
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr "Provider-Modul für Quantum-Plug-in"
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr "Quantum-Quotentreiberklasse"
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+#~ "Sie müssen eine Konfigurationsdatei für "
+#~ "die Brücke angeben: entweder '--config-"
+#~ "file' oder env[QUANTUM_TEST_CONFIG_FILE]"
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr "Quantum-Servicetypverwaltung"
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+#~ "API zum Abrufen und Verwalten von "
+#~ "Servicetypen für erweiterte Quantum-Services"
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr "Benutzer hat die ID für diese Quantum-Implementierung definiert"
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr "QuantumRestProxy: Starten von Plug-in. Version=%s"
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr "QuantumRestProxyV2: Initialisierung abgeschlossen"
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'create_network()'"
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr "QuantumRestProxyV2: Erstellung von fernem Netz nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr "Aufruf von 'QuantumRestProxyV2.update_network()'"
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr "QuantumRestProxyV2: Aktualisierung von fernem Netz nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'delete_network()'"
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'create_port()'"
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr "QuantumRestProxyV2: Erstellung von fernem Port nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'update_port()'"
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'delete_port()'"
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr "QuantumRestProxyV2: Aktualisierung von fernem Port nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von '_plug_interface()'"
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr "QuantumRestProxyV2: Aktualisierung von fernem Netz nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von '_unplug_interface()'"
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'create_subnet()'"
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'update_subnet()'"
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'delete_subnet()'"
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'create_router()'"
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr "QuantumRestProxyV2: Erstellung von fernem Router nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr "Aufruf von 'QuantumRestProxyV2.update_router()'"
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr "QuantumRestProxyV2: Aktualisierung von fernem Router nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'delete_router()'"
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr "QuantumRestProxyV2: Löschen von fernem Router nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'add_router_interface()'"
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr "QuantumRestProxyV2: Erstellung von Schnittstelle nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'remove_router_interface()'"
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr "QuantumRestProxyV2: Löschen von ferner Schnittstelle nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'create_floatingip()'"
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+#~ "QuantumRestProxyV2: Erstellung von ferner "
+#~ "dynamischer IP-Adresse nicht möglich: %s"
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'update_floatingip()'"
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr "QuantumRestProxyV2: Aufruf von 'delete_floatingip()'"
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr "QuantumRestProxy: Aktualisierung von ferner Topologie nicht möglich: %s"
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+#~ "Die Quantum-Datenbank konnte nicht "
+#~ "gelöscht werden; 'bridge=%r' für MidoNet "
+#~ "wurde gelöscht"
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+#~ "Konsistenz von Quantum-OFC-Ressourcenzuordnung"
+#~ " ist beschädigt: %(reason)s"
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr "NotFound-%(resource)s für quantum_id=%(id)s."
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ 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"
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+#~ "Verbinden der Zusatzeinheit mit Port des"
+#~ " logischen NVP-Routers %(r_port_id)s, der"
+#~ " Quantum %(q_port_id)s zugeordnet ist, ist"
+#~ " nicht möglich"
+
+#~ 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 ""
+#~ "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"
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr "NVP-UUID für Quantum-Port %s kann nicht gefunden werden"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+#~ "Aktueller Netzstatus: %(nvp_net_status)s; Status "
+#~ "in der Quantum-Datenbank: %(quantum_status)s"
+
+#~ 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."
+#~ " "
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+#~ "%s logische Switches gefunden, die nicht"
+#~ " an Quantum-Netze gebunden sind. "
+#~ "Quantum und NVP sind möglicherweise "
+#~ "nicht synchron"
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr "Logischer Quantum-Port %s wurde auf NVP nicht gefunden"
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+#~ "%s logische Ports gefunden, die nicht"
+#~ " an Quantum-Ports gebunden sind. "
+#~ "Quantum und NVP sind möglicherweise "
+#~ "nicht synchron"
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+#~ "Aktueller Routerstatus: %(router_status)s; Status"
+#~ " in der Quantum-Datenbank: "
+#~ "%(db_router_status)s"
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+#~ "%s logische Router gefunden, die nicht"
+#~ " an Quantum-Router gebunden sind. "
+#~ "Quantum und NVP sind möglicherweise "
+#~ "nicht synchron"
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+#~ "Port für den logischen Router von "
+#~ "NVP konnte für Quantum-Port-ID "
+#~ "nicht gefunden werden: %s. War dieser"
+#~ " Ports jemals paarweise mit einem "
+#~ "logischen Router verbunden?"
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+#~ "Suche nach Ports mit dem 'q_port_id'-Tag"
+#~ " '%(quantum_port_id)s' auf: '%(lswitch_uuid)s'"
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+#~ "'%(num_ports)d' Ports mit 'q_port_id'-Tag: "
+#~ "'%(quantum_port_id)s' gefunden. Nur einer "
+#~ "wurde erwartet."
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+#~ "Aktiviert die dedizierte Verbindung mit "
+#~ "dem Metadaten-Proxy für den "
+#~ "Metadatenserverzugriff über den Quantum-Router"
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+#~ "Dies ist die UUID der Standard-"
+#~ "NVP-Transportzone, die zur Erstellung "
+#~ "getunnelter isolierter \"Quantum\"-Netze verwendet"
+#~ " wird. Sie muss in NVP erstellt "
+#~ "werden, bevor Quantum mit dem NVP-"
+#~ "Plug-in gestartet wird."
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+#~ "Netzgateway '%(gateway_id)s' hat noch aktive"
+#~ " Zuordnungen zu mindestens einem "
+#~ "Quantum-Netz."
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+#~ "Status von 'QuantumPluginPLUMgrid': Erstellung "
+#~ "von Nachrichtendaten für NOS"
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': Plug-in wird gestartet"
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': Plug-in wird beendet"
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr "QuantumPluginPLUMgrid-NOS: %s"
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+#~ "Status von 'QuantumPluginPLUMgrid': NOS-Wert"
+#~ " fehlt in der Konfigurationsdatei"
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+#~ "Status von 'QuantumPluginPLUMgrid': Quantum-"
+#~ "Server mit PLUMgrid-Plug-in wurde "
+#~ "gestartet"
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'create_network()'"
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr "Aufruf von 'QuantumPluginPLUMgridV2.update_network()'"
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'delete_network()'"
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'create_port()'"
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'update_port()'"
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'delete_port()'"
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'create_subnet()'"
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': Aufruf von 'delete_subnet()'"
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr "Status von 'QuantumPluginPLUMgrid': REST-Verbindung wurde gestartet"
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
-#~ "Aufruf von 'MidonetPluginV2.get_networks': "
-#~ "filters=%(filters)r, fields=%(fields)r"
+#~ "FEHLER: Konfigurationsdatei kann über die "
+#~ "Standardsuchpfade (~/.quantum/, ~/, /etc/quantum/,"
+#~ " /etc/) und über die Option "
+#~ "'--config-file' nicht gefunden werden!"
 

diff --git a/neutron/locale/es/LC_MESSAGES/neutron.po b/neutron/locale/es/LC_MESSAGES/neutron.po
index 2115917680f753cfbd700ba7ab3bd8545293e617..fb77e41b6f3a6d7afbc489a736cac36dba16b376 100644 (file)
--- a/neutron/locale/es/LC_MESSAGES/neutron.po
+++ b/neutron/locale/es/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/fi_FI/LC_MESSAGES/neutron.po b/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
index cd822ab95f30e5e0dc5c4446e24c0bdb562c4a38..6694a21584d389021b4f970309aba2995b4e6d37 100644 (file)
--- a/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
+++ b/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (Finland) "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/fr/LC_MESSAGES/neutron.po b/neutron/locale/fr/LC_MESSAGES/neutron.po
index 02228337f4a7527cffa3d0f73cdbda5ecf7e2f15..b822bfbd30a12f58cc92530e8eb873eaf1f43c52 100644 (file)
--- a/neutron/locale/fr/LC_MESSAGES/neutron.po
+++ b/neutron/locale/fr/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/it/LC_MESSAGES/neutron.po b/neutron/locale/it/LC_MESSAGES/neutron.po
index ec75dbefb06e4832fd2e6bcfdd4cd2c8038aa6dc..894d366b9a4a7a4e414a9145834e48f3e3314049 100644 (file)
--- a/neutron/locale/it/LC_MESSAGES/neutron.po
+++ b/neutron/locale/it/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/ja/LC_MESSAGES/neutron.po b/neutron/locale/ja/LC_MESSAGES/neutron.po
index c65bc43430c763f1f8dfff10605a82e0d840a231..0bbd15f715b64a0fd4e2411f51ad7cf167dca8d4 100644 (file)
--- a/neutron/locale/ja/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ja/LC_MESSAGES/neutron.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-01-30 10:28+0000\n"
 "Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese "
@@ -19,958 +19,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr "内部エラー"
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -980,741 +987,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr "管理ユーザー"
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1722,822 +1729,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2545,7 +2562,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2553,142 +2570,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2696,391 +2713,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3088,433 +3105,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3523,39 +3540,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3563,1759 +3580,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5323,12 +5335,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5336,12 +5348,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5349,57 +5361,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5407,7 +5419,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5415,542 +5427,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5958,486 +5970,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6445,1998 +6457,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/ka_GE/LC_MESSAGES/neutron.po b/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
index 4e37bd9ce0356995b17bdf768c0cd68264ad5630..69a9c46734206379da6b9d54ba92ca95a1bd1678 100644 (file)
--- a/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+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"
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
-msgstr "Quantum core_plugin არ აარის დაკონფიგურირებული!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
+msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr "პლაგინის მდებარეობა: %s"
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr "იტვირთება პლაგინი: %s"
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr "შეცდომა პლაგინის ცატვისრთვისას"
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr "იტვირთება სერვისის პლაგინები: %s"
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr "პლაგინი ვერ მოიძებნა."
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr "დაკონფიგურირდა რამოდენიმე პლაგინი %s სერვისისთვის"
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
+msgstr ""
+
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr "აკლია Content-Type"
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr "არასწორი მოთხოვნის ნაწილი"
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr "სისტემური შეცდომა"
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr "სინქრონიზაცის მდგომარეობა"
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr "ტქვენ უნდა მიუთითოთ ინტერფეისის დრაივერი"
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr "L3 აგენტი ჩაირთულია"
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr "პროვაიდერის წესი განახლებულია"
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr "ფაირვოლის წესების განახლება"
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr "შეცდომა %s წაკითხვისას"
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr "პროცესი არ დაწყებულა %s -თვის"
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr "MTU პარამეტრები მოწყობილობისთვის."
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr "მოწყობილობა %s უკვე არსებობს"
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr "დრაივერის მდებარეობა: %s"
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, fuzzy, python-format
 msgid "Interface %s not found."
 msgstr "პლაგინი ვერ მოიძებნა."
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr "მოთხოვნა: %s"
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr "საჭირო რესურსები"
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr "%s ვერ განხორციელდა"
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr "ლოგირება ჩართულია!"
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr "არ არის ავტორიზებული."
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr "სერვისი მიუწვდომელია"
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr "რესურსი გამოყენებულია"
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, fuzzy, python-format
 msgid "%s. Agent terminated!"
 msgstr "L3 აგენტი ჩაირთულია"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,487 +5969,487 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, fuzzy, python-format
 msgid "%s. Server terminated!"
 msgstr "L3 აგენტი ჩაირთულია"
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 #, fuzzy
 msgid "eSwitch Agent Started!"
 msgstr "L3 აგენტი ჩაირთულია"
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6445,1998 +6457,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, fuzzy, python-format
 msgid "Network %s was not found in NVP."
 msgstr "პლაგინი ვერ მოიძებნა."
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr "Quantum core_plugin არ აარის დაკონფიგურირებული!"
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/ko_KR/LC_MESSAGES/neutron.po b/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
index a60dc39fb94dc0b9d5ad047c7362d0871e08f2b0..2753b1d0ebc174c8a7e71d93be4f7c21b9191c87 100644 (file)
--- a/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+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"
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr "플러그인 위치: %s"
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr "로딩 플러그인: %s"
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr "로딩중인 플러그인 에러"
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr "플러그인 서비스 로딩중: %s"
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index d1364187db67c14359b33e4705bfdb09c7a690f3..6450f6a934dfbd1e1c6848b64ceb433e1eec2100 100644 (file)
--- a/neutron/locale/neutron.pot
+++ b/neutron/locale/neutron.pot
@@ -1,15 +1,14 @@
-# Translations template for quantum.
+# Translations template for neutron.
 # Copyright (C) 2013 ORGANIZATION
-# This file is distributed under the same license as the quantum project.
+# This file is distributed under the same license as the neutron project.
 # FIRST AUTHOR <EMAIL@ADDRESS>, 2013.
 #
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: quantum "
-"jenkins.quantum.propose.translation.update.156\n"
+"Project-Id-Version: neutron jenkins.neutron.propose.translation.update.2\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+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"
@@ -18,958 +17,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
+msgstr ""
+
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +985,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1727,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2560,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2568,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2711,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3103,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3538,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3578,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5333,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5346,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5359,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5417,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5425,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5968,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1992 +6455,1992 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""

diff --git a/neutron/locale/pl_PL/LC_MESSAGES/neutron.po b/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
index 77b0d36bcde1b5bdb2795661ae198f27b775a314..f078371e86aff7fc6fa6c6c6fd36d38c6b7c1a40 100644 (file)
--- a/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
+++ b/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-06-28 06:06+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Polish (Poland) "
@@ -19,958 +19,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -980,741 +987,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1722,822 +1729,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2545,7 +2562,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2553,142 +2570,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2696,391 +2713,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3088,433 +3105,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3523,39 +3540,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3563,1759 +3580,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5323,12 +5335,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5336,12 +5348,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5349,57 +5361,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5407,7 +5419,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5415,542 +5427,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5958,486 +5970,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6445,1998 +6457,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/pt_BR/LC_MESSAGES/neutron.po b/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
index bbd49b946c93c1401bf8258a6cc20a5446521c16..ca8a0dc4da5d1269d18d556c185b2f320f512e4a 100644 (file)
--- a/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
+++ b/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (Brazil) "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/ro/LC_MESSAGES/neutron.po b/neutron/locale/ro/LC_MESSAGES/neutron.po
index 87c4e8ca25df4c84accc27b958c57da65b617058..52f41119e37be947e26d469694df0bfe8bffccfa 100644 (file)
--- a/neutron/locale/ro/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ro/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-06-08 07:51+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Romanian "
@@ -19,958 +19,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -980,741 +987,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1722,822 +1729,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2545,7 +2562,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2553,142 +2570,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2696,391 +2713,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3088,433 +3105,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3523,39 +3540,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3563,1759 +3580,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5323,12 +5335,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5336,12 +5348,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5349,57 +5361,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5407,7 +5419,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5415,542 +5427,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5958,486 +5970,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6445,1998 +6457,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/ru/LC_MESSAGES/neutron.po b/neutron/locale/ru/LC_MESSAGES/neutron.po
index cad9553d1a0730771d8d842b455d1730296dcaa3..873aa311c800f473e4ee8ad18e4d29dff48b1c4c 100644 (file)
--- a/neutron/locale/ru/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ru/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -19,958 +19,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -980,741 +987,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1722,822 +1729,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2545,7 +2562,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2553,142 +2570,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2696,391 +2713,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3088,433 +3105,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3523,39 +3540,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3563,1759 +3580,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5323,12 +5335,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5336,12 +5348,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5349,57 +5361,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5407,7 +5419,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5415,542 +5427,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5958,486 +5970,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6445,1998 +6457,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/sl_SI/LC_MESSAGES/neutron.po b/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
index de578e3938cce2294f97fbf3f4ff31597d839ee3..404f941040b92396dc2c59ed0ffb1db8c4228194 100644 (file)
--- a/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-06-28 06:06+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Slovenian (Slovenia) "
@@ -19,958 +19,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -980,741 +987,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1722,822 +1729,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2545,7 +2562,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2553,142 +2570,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2696,391 +2713,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3088,433 +3105,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3523,39 +3540,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3563,1759 +3580,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5323,12 +5335,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5336,12 +5348,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5349,57 +5361,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5407,7 +5419,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5415,542 +5427,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5958,486 +5970,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6445,1998 +6457,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/vi_VN/LC_MESSAGES/neutron.po b/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
index 207c259d2ef3cf7a38eab017aabe241761fbe349..4931916e41648128e1e4a7509129c6fc114ac353 100644 (file)
--- a/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/zh_CN/LC_MESSAGES/neutron.po b/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
index 7cb6803909e664aa11ed47332a858db6db0607f0..ec4c88992d9a3ad60416acbacb7262e1d020cd2d 100644 (file)
--- a/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) "
@@ -18,958 +18,965 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr ""
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr ""
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr ""
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
 msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr ""
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr ""
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr ""
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr ""
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr ""
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr ""
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr ""
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr ""
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr ""
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr ""
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr ""
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr ""
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
 msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr ""
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr ""
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr ""
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr ""
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr ""
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr ""
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr ""
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr ""
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr ""
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr ""
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr ""
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr ""
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr ""
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr ""
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr ""
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr ""
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr ""
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr ""
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr ""
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr ""
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr ""
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr ""
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr ""
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr ""
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr ""
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr ""
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr ""
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr ""
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -979,741 +986,741 @@ msgid ""
 "Stderr: %(stderr)r"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr ""
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr ""
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr ""
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr ""
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr ""
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr ""
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr ""
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr ""
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr ""
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr ""
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr ""
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr ""
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr ""
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr ""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr ""
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr ""
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr ""
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr ""
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr ""
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr ""
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr ""
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr ""
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr ""
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr ""
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr ""
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr ""
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr ""
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr ""
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr ""
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr ""
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr ""
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr ""
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr ""
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr ""
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr ""
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr ""
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
 msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
 msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
 msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr ""
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr ""
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr ""
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr ""
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr ""
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr ""
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
 msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
 msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr ""
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr ""
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr ""
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr ""
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr ""
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr ""
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr ""
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr ""
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr ""
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr ""
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1721,822 +1728,832 @@ msgid ""
 "%(att_port_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr ""
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr ""
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr ""
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr ""
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr ""
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr ""
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr ""
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr ""
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr ""
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr ""
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr ""
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr ""
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr ""
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr ""
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr ""
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr ""
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
 "of subnet %(sub_id)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr ""
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr ""
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr ""
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr ""
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr ""
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr ""
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
 " %s"
 msgstr ""
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr ""
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr ""
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr ""
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr ""
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr ""
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
 msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
 msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr ""
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr ""
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr ""
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr ""
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr ""
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr ""
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr ""
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr ""
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr ""
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr ""
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr ""
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr ""
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr ""
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr ""
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr ""
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
 msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr ""
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr ""
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr ""
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr ""
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2544,7 +2561,7 @@ msgid ""
 "Floating IP."
 msgstr ""
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2552,142 +2569,142 @@ msgid ""
 "has a floating IP on external network %(net_id)s."
 msgstr ""
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr ""
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr ""
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr ""
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr ""
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr ""
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr ""
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2695,391 +2712,391 @@ msgid ""
 "supported."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr ""
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
 msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
 msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr ""
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, python-format
 msgid "Got file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/lockutils.py:235
+#: neutron/openstack/common/lockutils.py:235
 #, python-format
 msgid "Released file lock \"%(lock)s\" at %(path)s for method \"%(method)s\"..."
 msgstr ""
 
-#: quantum/openstack/common/log.py:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/openstack/common/periodic_task.py:176
 #, python-format
 msgid "Running periodic task %(full_task_name)s"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:184
+#: neutron/openstack/common/periodic_task.py:184
 #, python-format
 msgid "Error during %(full_task_name)s: %(e)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/openstack/common/processutils.py:127
 #, python-format
 msgid "Got unknown keyword args to utils.execute: %r"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, python-format
 msgid "Running cmd (SSH): %s"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr ""
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr ""
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: quantum/openstack/common/service.py:258
+#: neutron/openstack/common/service.py:258
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:262
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: quantum/openstack/common/service.py:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr ""
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr ""
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3087,433 +3104,433 @@ msgid ""
 "following: [%(stack)s]."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
 "%(traceback)s."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
 "%(max_retries)d tries: %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
 "again in %(sleep_time)d seconds."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr ""
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3522,39 +3539,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3562,1759 +3579,1754 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr ""
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr ""
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
 " - %(err_desc)s - Error code: %(err_code)d"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr ""
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr ""
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr ""
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
 "name=%(name)smetadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5322,12 +5334,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5335,12 +5347,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5348,57 +5360,57 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
 "router_id=%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5406,7 +5418,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5414,542 +5426,542 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
 "sg_name=%(sg_name)s "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
 "sg_id=%(sg_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 msgid "MidonetPluginV2.update_network called: id=%(id)r, network=%(network)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
 "l3_port_check=%(l3_port_check)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
 "interface_info=%(interface_info)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
 "floatingip=%(floatingip)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
 "security_group=%(security_group)s default_sg=%(default_sg)s "
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
 "tenant_id=%(tenant_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
 "security_group_rule=%(security_group_rule)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, python-format
 msgid "Loaded type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, python-format
 msgid "Registered types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, python-format
 msgid "Tenant network_types: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, python-format
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 msgid "Modular L2 Plugin initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, python-format
 msgid "Network %s has no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, python-format
 msgid "Returning: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 msgid "physical_network required for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, python-format
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -5957,486 +5969,486 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 msgid "physical_network required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 msgid "segmentation_id required for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
 "packet_filter=%(packet_filter)s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
 "=> %(ret)s."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6444,1998 +6456,2370 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr ""
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr ""
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr ""
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr ""
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr ""
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr ""
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, python-format
 msgid ""
 "Unable to plug attachment in NVP logical router port %(r_port_id)s, "
-"associated with Quantum %(q_port_id)s"
+"associated with Neutron %(q_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, python-format
 msgid "_nvp_delete_port completed for port %(port_id)s on network %(net_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, python-format
 msgid "The gateway port for the router %s was not found on the NVP backend"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:535
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, 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:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
+msgid "Unable to find NVP uuid for Neutron port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, python-format
 msgid "%(net_type_param)s %(net_type_value)s not supported"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, python-format
 msgid ""
-"Current network status:%(nvp_net_status)s; Status in Quantum "
-"DB:%(quantum_status)s"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
+msgid "Logical Switch %s found in neutron database but not in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
+msgid "Neutron logical port %s was not found on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, python-format
 msgid "create_port completed on NVP for tenant %(tenant_id)s: (%(id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, python-format
 msgid ""
 "Add_router_interface completed for subnet:%(subnet_id)s and "
 "router:%(router_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, python-format
 msgid ""
 "An error occurred while removing NAT rules on the NVP platform for "
 "floating ip:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, python-format
 msgid ""
 "Create_l2_gw_service did not return an uuid for the newly created "
 "resource:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr ""
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr ""
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr ""
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
+"access via Neutron router"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
+"more neutron networks."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, python-format
 msgid "Connecting network '%(network_id)s' to gateway '%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, python-format
 msgid ""
 "Gateway port for '%(network_gateway_id)s' created on network "
 "'%(network_id)s':%(port_id)s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr ""
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr ""
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
 "%(key_max)d. Using default value"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr ""
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr ""
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr ""
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr ""
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr ""
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr ""
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr ""
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr ""
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr ""
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr ""
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr ""
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr ""
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr ""
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr ""
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr ""
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr ""
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr ""
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to create logical router port "
+#~ "for quantum port id %(port_id)s on "
+#~ "router %(router_id)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to plug attachment in NVP "
+#~ "logical router port %(r_port_id)s, associated"
+#~ " with Quantum %(q_port_id)s"
+#~ msgstr ""
+
+#~ 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 ""
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr ""
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current network status:%(nvp_net_status)s; Status"
+#~ " in Quantum DB:%(quantum_status)s"
+#~ msgstr ""
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Current router status:%(router_status)s;Status in"
+#~ " Quantum DB:%(db_router_status)s"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Unable to find NVP logical router "
+#~ "port for Quantum port id:%s. Was "
+#~ "this port ever paired with a "
+#~ "logical router?"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr ""
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr ""
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
 #~ msgstr ""
 

diff --git a/neutron/locale/zh_TW/LC_MESSAGES/neutron.po b/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
index e448387275a28eb41682e8ccd977c0009f680c74..45f970392cbecdbff0b0c785b3dbc30834290a9a 100644 (file)
--- a/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
+++ b/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-07-03 12:11+0000\n"
+"POT-Creation-Date: 2013-07-07 19:55+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) "
@@ -18,963 +18,966 @@ msgstr ""
 "Content-Transfer-Encoding: 8bit\n"
 "Generated-By: Babel 0.9.6\n"
 
-#: quantum/auth.py:36
+#: quantum/auth.py:26 quantum/api/__init__.py:29
+msgid ""
+"You are using old configuration values for the api-paste config. Please "
+"update for Neutron."
+msgstr ""
+
+#: neutron/auth.py:36
 msgid "Neither X_USER_ID nor X_USER found in request"
 msgstr "在要求中找不到 X_USER_ID 及 X_USER"
 
-#: quantum/context.py:49
+#: neutron/context.py:49
 #, python-format
 msgid "Arguments dropped when creating context: %s"
 msgstr "建立環境定義時捨棄了引數：%s"
 
-#: quantum/context.py:95
+#: neutron/context.py:95
 #, python-format
 msgid "read_deleted can only be one of 'no', 'yes' or 'only', not %r"
 msgstr "read_deleted 只能是 'no'、'yes' 或 'only' 其中之一，不能是 %r"
 
-#: quantum/manager.py:69
+#: neutron/manager.py:69
 #, python-format
 msgid "dhcp_agents_per_network must be >= 1. '%s' is invalid."
 msgstr ""
 
-#: quantum/manager.py:81
-msgid "Quantum core_plugin not configured!"
-msgstr "未配置 Quantum core_plugin！"
+#: neutron/manager.py:81
+msgid "Neutron core_plugin not configured!"
+msgstr ""
 
-#: quantum/manager.py:110 quantum/plugins/metaplugin/meta_quantum_plugin.py:114
+#: neutron/manager.py:110 neutron/plugins/metaplugin/meta_neutron_plugin.py:114
 #, python-format
 msgid "Plugin location: %s"
 msgstr "外掛程式位置：%s"
 
-#: quantum/manager.py:113 quantum/manager.py:163
+#: neutron/manager.py:113 neutron/manager.py:161
 #, python-format
 msgid "Loading Plugin: %s"
 msgstr "正在載入外掛程式：%s"
 
-#: quantum/manager.py:116 quantum/manager.py:166
+#: neutron/manager.py:116 neutron/manager.py:164
 msgid "Error loading plugin"
 msgstr "載入外掛程式時發生錯誤"
 
-#: quantum/manager.py:117
-msgid ""
-"Plugin not found.  You can install a plugin with: pip install <plugin-"
-"name>\n"
-"Example: pip install quantum-sample-plugin"
+#: neutron/manager.py:117
+msgid "Plugin not found. "
 msgstr ""
-"找不到外掛程式。可以使用下列指令來安裝外掛程式：pip install <plugin-name>\n"
-"範例：pip install quantum-sample-plugin"
 
-#: quantum/manager.py:136
+#: neutron/manager.py:134
 msgid "Loading services supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:145
+#: neutron/manager.py:143
 #, python-format
 msgid "Service %s is supported by the core plugin"
 msgstr ""
 
-#: quantum/manager.py:158
+#: neutron/manager.py:156
 #, python-format
 msgid "Loading service plugins: %s"
 msgstr "正在載入服務外掛程式：%s"
 
-#: quantum/manager.py:167
+#: neutron/manager.py:165
 msgid "Plugin not found."
 msgstr "找不到外掛程式。"
 
-#: quantum/manager.py:174
+#: neutron/manager.py:172
 #, python-format
 msgid "Multiple plugins for service %s were configured"
 msgstr "已給服務 %s 配置多個外掛程式"
 
-#: quantum/manager.py:180
+#: neutron/manager.py:178
 #, python-format
 msgid "Successfully loaded %(type)s plugin. Description: %(desc)s"
 msgstr "已順利載入 %(type)s 外掛程式。說明：%(desc)s"
 
-#: quantum/policy.py:88
+#: neutron/policy.py:88
 #, python-format
 msgid "loading policies from file: %s"
 msgstr ""
 
-#: quantum/policy.py:95
+#: neutron/policy.py:95
 #, python-format
 msgid ""
 "Found deprecated policy rule:%s. Please consider upgrading your policy "
 "configuration file"
 msgstr ""
 
-#: quantum/policy.py:107
+#: neutron/policy.py:107
 #, python-format
 msgid ""
 "Inserting policy:%(new_policy)s in place of deprecated "
 "policy:%(old_policy)s"
 msgstr ""
 
-#: quantum/policy.py:115
+#: neutron/policy.py:115
 #, python-format
 msgid ""
 "Backward compatibility unavailable for deprecated policy %s. The policy "
 "will not be enforced"
 msgstr ""
 
-#: quantum/policy.py:181
+#: neutron/policy.py:181
 #, python-format
 msgid ""
 "Unable to identify a target field from:%s.match should be in the form "
 "%%(<field_name>)s"
 msgstr ""
 
-#: quantum/policy.py:207
+#: neutron/policy.py:207
 #, python-format
 msgid "Unable to find ':' as separator in %s."
 msgstr ""
 
-#: quantum/policy.py:211
+#: neutron/policy.py:211
 #, python-format
 msgid "Unable to find resource name in %s"
 msgstr ""
 
-#: quantum/policy.py:220
+#: neutron/policy.py:220
 #, python-format
 msgid ""
 "Unable to verify match:%(match)s as the parent resource: %(res)s was not "
 "found"
 msgstr ""
 
-#: quantum/policy.py:242
+#: neutron/policy.py:242
 #, python-format
 msgid "Policy check error while calling %s!"
 msgstr ""
 
-#: quantum/policy.py:274
+#: neutron/policy.py:274
 #, python-format
 msgid "Unable to find requested field: %(field)s in target: %(target_dict)s"
 msgstr "在目標 %(target_dict)s 中找不到所要求的欄位：%(field)s"
 
-#: quantum/quota.py:30
+#: neutron/quota.py:30
 msgid "Resource name(s) that are supported in quota features"
 msgstr "配額功能中支援的資源名稱"
 
-#: quantum/quota.py:34
+#: neutron/quota.py:34
 msgid "Default number of resource allowed per tenant, minus for unlimited"
 msgstr "每個 Tenant 所容許的預設資源數目，減號表示無限制"
 
-#: quantum/quota.py:38
+#: neutron/quota.py:38
 msgid "Number of networks allowed per tenant,minus for unlimited"
 msgstr "每個 Tenant 所容許的網路數目，減號表示無限制"
 
-#: quantum/quota.py:42
+#: neutron/quota.py:42
 msgid "Number of subnets allowed per tenant, minus for unlimited"
 msgstr "每個 Tenant 所容許的子網路數目，減號表示無限制"
 
-#: quantum/quota.py:46
+#: neutron/quota.py:46
 msgid "number of ports allowed per tenant, minus for unlimited"
 msgstr "每個 Tenant 所容許的埠數目，減號表示無限制"
 
-#: quantum/quota.py:50
+#: neutron/quota.py:50
 msgid "Default driver to use for quota checks"
 msgstr "要用於配額檢查的預設驅動程式"
 
-#: quantum/quota.py:223
+#: neutron/quota.py:223
 #, python-format
 msgid "%s is already registered."
 msgstr "已登錄 %s。"
 
-#: quantum/service.py:39
+#: neutron/service.py:37
 msgid "Seconds between running periodic tasks"
 msgstr "執行定期作業的間隔秒數"
 
-#: quantum/service.py:42
+#: neutron/service.py:40
 msgid ""
 "range of seconds to randomly delay when starting the periodic task "
 "scheduler to reduce stampeding. (Disable by setting to 0)"
 msgstr "啟動定期作業排程器以減少大混亂的隨機延遲秒數範圍。（如果要停用，則設為 0）"
 
-#: quantum/service.py:96
-msgid "In WsgiService.create()"
-msgstr "在 WsgiService.create() 中"
+#: neutron/service.py:96
+msgid "Attempting fallback to old Quantum api-paste config"
+msgstr ""
+
+#: neutron/service.py:100
+msgid "In serve_wsgi()"
+msgstr ""
 
-#: quantum/service.py:107
+#: neutron/service.py:109
 msgid "No known API applications configured."
 msgstr "未配置已知的 API 應用程式。"
 
-#: quantum/service.py:113
+#: neutron/service.py:115
 #, python-format
-msgid "Quantum service started, listening on %(host)s:%(port)s"
-msgstr "Quantum 服務已啟動，正在 %(host)s:%(port)s 上進行接聽"
+msgid "Neutron service started, listening on %(host)s:%(port)s"
+msgstr ""
 
-#: quantum/service.py:214
+#: neutron/service.py:216
 msgid "Exception occurs when timer stops"
 msgstr "計時器停止時發生異常狀況"
 
-#: quantum/service.py:224
+#: neutron/service.py:226
 msgid "Exception occurs when waiting for timer"
 msgstr "等待計時器時發生異常狀況"
 
-#: quantum/wsgi.py:46
+#: neutron/wsgi.py:46
 msgid "Number of backlog requests to configure the socket with"
 msgstr ""
 
-#: quantum/wsgi.py:50
+#: neutron/wsgi.py:50
 msgid ""
 "Sets the value of TCP_KEEPIDLE in seconds for each server socket. Not "
 "supported on OS X."
 msgstr ""
 
-#: quantum/wsgi.py:54
+#: neutron/wsgi.py:54
 msgid "Number of seconds to keep retrying to listen"
 msgstr ""
 
-#: quantum/wsgi.py:57
+#: neutron/wsgi.py:57
 msgid "Enable SSL on the API server"
 msgstr ""
 
-#: quantum/wsgi.py:60
+#: neutron/wsgi.py:60
 msgid "CA certificate file to use to verify connecting clients"
 msgstr ""
 
-#: quantum/wsgi.py:64
+#: neutron/wsgi.py:64
 msgid "Certificate file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:68
+#: neutron/wsgi.py:68
 msgid "Private key file to use when starting the server securely"
 msgstr ""
 
-#: quantum/wsgi.py:104
+#: neutron/wsgi.py:104
 #, python-format
 msgid "Unable to listen on %(host)s:%(port)s"
 msgstr "無法在 %(host)s:%(port)s 上進行接聽"
 
-#: quantum/wsgi.py:110
+#: neutron/wsgi.py:110
 #, python-format
 msgid "Unable to find ssl_cert_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:114
+#: neutron/wsgi.py:114
 #, python-format
 msgid "Unable to find ssl_key_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:119
+#: neutron/wsgi.py:119
 #, python-format
 msgid "Unable to find ssl_ca_file : %s"
 msgstr ""
 
-#: quantum/wsgi.py:151
+#: neutron/wsgi.py:151
 #, python-format
 msgid "Could not bind to %(host)s:%(port)s after trying for %(time)d seconds"
 msgstr ""
 
-#: quantum/wsgi.py:295
+#: neutron/wsgi.py:295
 msgid "Missing Content-Type"
 msgstr "遺漏了內容類型"
 
-#: quantum/wsgi.py:470
+#: neutron/wsgi.py:470
 #, python-format
 msgid "Data %(data)s type is %(type)s"
 msgstr "資料 %(data)s 類型為 %(type)s"
 
-#: quantum/wsgi.py:553
+#: neutron/wsgi.py:553
 msgid "Cannot understand JSON"
 msgstr "無法理解 JSON"
 
-#: quantum/wsgi.py:566 quantum/wsgi.py:569
+#: neutron/wsgi.py:566 neutron/wsgi.py:569
 msgid "Inline DTD forbidden"
 msgstr "已禁止行內 DTD"
 
-#: quantum/wsgi.py:645
+#: neutron/wsgi.py:645
 msgid "Cannot understand XML"
 msgstr "無法理解 XML"
 
-#: quantum/wsgi.py:756
+#: neutron/wsgi.py:756
 msgid "Unrecognized Content-Type provided in request"
 msgstr "無法辨識要求中所提供的內容類型"
 
-#: quantum/wsgi.py:760
+#: neutron/wsgi.py:760
 msgid "No Content-Type provided in request"
 msgstr "要求中未提供內容類型"
 
-#: quantum/wsgi.py:764
+#: neutron/wsgi.py:764
 msgid "Empty body provided in request"
 msgstr "要求中所提供主體是空的"
 
-#: quantum/wsgi.py:770
+#: neutron/wsgi.py:770
 msgid "Unable to deserialize body as provided Content-Type"
 msgstr "無法將主體解除序列化為提供的內容類型"
 
-#: quantum/wsgi.py:866
+#: neutron/wsgi.py:866
 msgid "You must implement __call__"
 msgstr "必須實作 __call__"
 
-#: quantum/wsgi.py:1003
+#: neutron/wsgi.py:1003
 #, python-format
 msgid "%(method)s %(url)s"
 msgstr "%(method)s %(url)s"
 
-#: quantum/wsgi.py:1009
+#: neutron/wsgi.py:1009
 msgid "Unsupported Content-Type"
 msgstr "不支援的內容類型"
 
-#: quantum/wsgi.py:1010
+#: neutron/wsgi.py:1010
 #, python-format
 msgid "InvalidContentType: %s"
 msgstr "InvalidContentType：%s"
 
-#: quantum/wsgi.py:1014
+#: neutron/wsgi.py:1014
 msgid "Malformed request body"
 msgstr "要求內文的格式不正確"
 
-#: quantum/wsgi.py:1015
+#: neutron/wsgi.py:1015
 #, python-format
 msgid "MalformedRequestBody: %s"
 msgstr "MalformedRequestBody：%s"
 
-#: quantum/wsgi.py:1022
+#: neutron/wsgi.py:1022
 #, python-format
 msgid "HTTP exception thrown: %s"
 msgstr "已擲出 HTTP 異常狀況：%s"
 
-#: quantum/wsgi.py:1027
+#: neutron/wsgi.py:1027
 msgid "Internal error"
 msgstr "內部錯誤"
 
-#: quantum/wsgi.py:1042 quantum/wsgi.py:1144
+#: neutron/wsgi.py:1042 neutron/wsgi.py:1144
 #, python-format
 msgid "%(url)s returned with HTTP %(status)d"
 msgstr "%(url)s 傳回了 HTTP %(status)d"
 
-#: quantum/wsgi.py:1045
+#: neutron/wsgi.py:1045
 #, python-format
 msgid "%(url)s returned a fault: %(exception)s"
 msgstr "%(url)s 傳回了錯誤：%(exception)s"
 
-#: quantum/wsgi.py:1221
+#: neutron/wsgi.py:1221
 msgid "Could not deserialize data"
 msgstr "無法解除序列化資料"
 
-#: quantum/agent/dhcp_agent.py:57
+#: neutron/agent/dhcp_agent.py:58
 msgid "Interval to resync."
 msgstr "重新同步的間隔。"
 
-#: quantum/agent/dhcp_agent.py:60 quantum/agent/netns_cleanup_util.py:68
+#: neutron/agent/dhcp_agent.py:61 neutron/agent/netns_cleanup_util.py:68
 msgid "The driver used to manage the DHCP server."
 msgstr "用於管理 DHCP 伺服器的驅動程式。"
 
-#: quantum/agent/dhcp_agent.py:62 quantum/agent/l3_agent.py:160
+#: neutron/agent/dhcp_agent.py:63 neutron/agent/l3_agent.py:161
 msgid "Allow overlapping IP."
 msgstr "容許重疊的 IP。"
 
-#: quantum/agent/dhcp_agent.py:64
+#: neutron/agent/dhcp_agent.py:65
 msgid "Support Metadata requests on isolated networks."
 msgstr "支援已隔離網路上的 meta 資料要求。"
 
-#: quantum/agent/dhcp_agent.py:66
+#: neutron/agent/dhcp_agent.py:67
 msgid ""
 "Allows for serving metadata requests from a dedicated network. Requires "
 "enable_isolated_metadata = True"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:101
+#: neutron/agent/dhcp_agent.py:102
 #, python-format
 msgid ""
 "The '%s' DHCP-driver does not support retrieving of a list of existing "
 "networks"
 msgstr "'%s' DHCP-driver 不支援擷取現有網路清單"
 
-#: quantum/agent/dhcp_agent.py:108 quantum/agent/dhcp_agent.py:780
+#: neutron/agent/dhcp_agent.py:109 neutron/agent/dhcp_agent.py:782
 msgid "DHCP agent started"
 msgstr "已啟動 DHCP 代理程式"
 
-#: quantum/agent/dhcp_agent.py:136
+#: neutron/agent/dhcp_agent.py:137
 #, python-format
 msgid "Unable to %s dhcp."
 msgstr "無法 %s DHCP。"
 
-#: quantum/agent/dhcp_agent.py:144
+#: neutron/agent/dhcp_agent.py:145
 msgid "Unable to update lease"
 msgstr "無法更新租賃"
 
-#: quantum/agent/dhcp_agent.py:148
+#: neutron/agent/dhcp_agent.py:149
 msgid "Synchronizing state"
 msgstr "正在同步化狀態"
 
-#: quantum/agent/dhcp_agent.py:160
+#: neutron/agent/dhcp_agent.py:161
 msgid "Unable to sync network state."
 msgstr "無法同步網路狀態。"
 
-#: quantum/agent/dhcp_agent.py:180 quantum/agent/dhcp_agent.py:218
+#: neutron/agent/dhcp_agent.py:181 neutron/agent/dhcp_agent.py:219
 #, python-format
 msgid "Network %s RPC info call failed."
 msgstr "呼叫網路 %s RPC 資訊失敗。"
 
-#: quantum/agent/dhcp_agent.py:310
+#: neutron/agent/dhcp_agent.py:311
 #, python-format
 msgid ""
 "%(port_num)d router ports found on the metadata access network. Only the "
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr "在 meta 資料存取網路上找到 %(port_num)d 個路由器埠。將僅考量路由器 %(router_id)s 的埠 %(port_id)s"
 
-#: quantum/agent/dhcp_agent.py:499 quantum/agent/l3_agent.py:148
-#: quantum/debug/debug_agent.py:45
+#: neutron/agent/dhcp_agent.py:500 neutron/agent/l3_agent.py:149
+#: neutron/debug/debug_agent.py:45
 msgid "The driver used to manage the virtual interface."
 msgstr "用於管理虛擬介面的驅動程式。"
 
-#: quantum/agent/dhcp_agent.py:507
+#: neutron/agent/dhcp_agent.py:508
 msgid "You must specify an interface driver"
 msgstr "必須指定介面驅動程式"
 
-#: quantum/agent/dhcp_agent.py:512 quantum/agent/l3_agent.py:189
+#: neutron/agent/dhcp_agent.py:514 neutron/agent/l3_agent.py:192
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr "匯入介面驅動程式 '%s' 時發生錯誤"
 
-#: quantum/agent/dhcp_agent.py:563
+#: neutron/agent/dhcp_agent.py:565
 #, python-format
 msgid "Setting gateway for dhcp netns on net %(n)s to %(ip)s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:573
+#: neutron/agent/dhcp_agent.py:575
 #, python-format
 msgid "Removing gateway for dhcp netns on net %s"
 msgstr ""
 
-#: quantum/agent/dhcp_agent.py:597 quantum/debug/debug_agent.py:75
+#: neutron/agent/dhcp_agent.py:599 neutron/debug/debug_agent.py:75
 #, python-format
 msgid "Reusing existing device: %s."
 msgstr "正在重複使用現有裝置：%s。"
 
-#: quantum/agent/dhcp_agent.py:684
+#: neutron/agent/dhcp_agent.py:686
 msgid "Location to DHCP lease relay UNIX domain socket"
 msgstr "DHCP 租賃中繼 UNIX 網域 Socket 的位置"
 
-#: quantum/agent/dhcp_agent.py:714
+#: neutron/agent/dhcp_agent.py:716
 #, python-format
 msgid "Network ID %s is not a valid UUID"
 msgstr "網路 ID %s 不是有效的 UUID"
 
-#: quantum/agent/dhcp_agent.py:720
+#: neutron/agent/dhcp_agent.py:722
 msgid "Unable to parse lease relay msg to dict."
 msgstr "無法將租賃中繼訊息剖析為字典。"
 
-#: quantum/agent/dhcp_agent.py:721
+#: neutron/agent/dhcp_agent.py:723
 #, python-format
 msgid "Exception value: %s"
 msgstr "異常狀況值：%s"
 
-#: quantum/agent/dhcp_agent.py:722
+#: neutron/agent/dhcp_agent.py:724
 #, python-format
 msgid "Message representation: %s"
 msgstr "訊息表示法：%s"
 
-#: quantum/agent/dhcp_agent.py:724
+#: neutron/agent/dhcp_agent.py:726
 msgid "Unable update lease. Exception"
 msgstr "無法更新租賃。異常狀況"
 
-#: quantum/agent/dhcp_agent.py:763 quantum/agent/l3_agent.py:761
+#: neutron/agent/dhcp_agent.py:765 neutron/agent/l3_agent.py:764
 msgid ""
-"Quantum server does not support state report. State report for this agent"
+"Neutron server does not support state report. State report for this agent"
 " will be disabled."
-msgstr "Quantum 伺服器不支援狀態報告。將停用此代理程式的狀態報告。"
+msgstr ""
 
-#: quantum/agent/dhcp_agent.py:769 quantum/agent/l3_agent.py:766
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:228
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:184
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:214
+#: neutron/agent/dhcp_agent.py:771 neutron/agent/l3_agent.py:769
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:228
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:184
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:215
 msgid "Failed reporting state!"
 msgstr "無法報告狀態！"
 
-#: quantum/agent/dhcp_agent.py:777 quantum/agent/l3_agent.py:771
+#: neutron/agent/dhcp_agent.py:779 neutron/agent/l3_agent.py:774
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "agent_updated 是由伺服器端 %s 執行！"
 
-#: quantum/agent/l3_agent.py:145 quantum/debug/debug_agent.py:48
+#: neutron/agent/l3_agent.py:146 neutron/debug/debug_agent.py:48
 msgid "Name of bridge used for external network traffic."
 msgstr "用於外部網路資料流量的橋接器名稱。"
 
-#: quantum/agent/l3_agent.py:152
-msgid "TCP Port used by Quantum metadata namespace proxy."
-msgstr "Quantum meta 資料名稱空間 Proxy 所使用的 TCP 埠。"
+#: neutron/agent/l3_agent.py:153
+msgid "TCP Port used by Neutron metadata namespace proxy."
+msgstr ""
 
-#: quantum/agent/l3_agent.py:156
+#: neutron/agent/l3_agent.py:157
 msgid ""
 "Send this many gratuitous ARPs for HA setup, set it below or equal to 0 "
 "to disable this feature."
 msgstr "給這個項目傳送了用於高可用性設定的許多無償 ARP，請將其設為小於或等於 0 以停用此功能。"
 
-#: quantum/agent/l3_agent.py:162
+#: neutron/agent/l3_agent.py:163
 #, fuzzy
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr "如果名稱空間已停用，則 L3 代理程式只能配置一個具有相符路由器 ID 的路由器。"
 
-#: quantum/agent/l3_agent.py:167
+#: neutron/agent/l3_agent.py:168
 msgid "Agent should implement routers with no gateway"
 msgstr "代理程式應該實作不含閘道的路由器"
 
-#: quantum/agent/l3_agent.py:169
+#: neutron/agent/l3_agent.py:170
 msgid "UUID of external network for routers implemented by the agents."
 msgstr "代理程式所實作路由器的外部網路 UUID。"
 
-#: quantum/agent/l3_agent.py:172
+#: neutron/agent/l3_agent.py:173
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:184
+#: neutron/agent/l3_agent.py:185
 msgid "An interface driver must be specified"
 msgstr "必須指定介面驅動程式"
 
-#: quantum/agent/l3_agent.py:218
+#: neutron/agent/l3_agent.py:221
 #, python-format
 msgid "Failed deleting namespace '%s'"
 msgstr "刪除名稱空間 '%s' 時失敗"
 
-#: quantum/agent/l3_agent.py:247
+#: neutron/agent/l3_agent.py:250
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
-"agent as Quantum has more than one external network."
+"agent as Neutron has more than one external network."
 msgstr ""
 
-#: quantum/agent/l3_agent.py:315
+#: neutron/agent/l3_agent.py:318
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr "路由器埠 %s 沒有 IP 位址"
 
-#: quantum/agent/l3_agent.py:317 quantum/db/l3_db.py:932
+#: neutron/agent/l3_agent.py:320 neutron/db/l3_db.py:932
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr "正在忽略路由器埠 %s 上的多個 IP"
 
-#: quantum/agent/l3_agent.py:449
+#: neutron/agent/l3_agent.py:452
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr "傳送無償 ARP 時失敗：%s"
 
-#: quantum/agent/l3_agent.py:591
+#: neutron/agent/l3_agent.py:594
 #, python-format
 msgid "Failed dealing with router '%s' deletion RPC message"
 msgstr "處理路由器 '%s' 刪除 RPC 訊息時失敗"
 
-#: quantum/agent/l3_agent.py:604
+#: neutron/agent/l3_agent.py:607
 msgid "Failed dealing with routers update RPC message"
 msgstr "處理路由器更新 RPC 訊息時失敗"
 
-#: quantum/agent/l3_agent.py:617
+#: neutron/agent/l3_agent.py:620
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr "外部網路橋接器 '%s' 不存在"
 
-#: quantum/agent/l3_agent.py:672
+#: neutron/agent/l3_agent.py:675
 msgid "Failed synchronizing routers"
 msgstr "同步路由器時失敗"
 
-#: quantum/agent/l3_agent.py:676
+#: neutron/agent/l3_agent.py:679
 msgid "L3 agent started"
 msgstr "已啟動 L3 代理程式"
 
-#: quantum/agent/l3_agent.py:696
+#: neutron/agent/l3_agent.py:699
 #, python-format
 msgid "Added route entry is '%s'"
 msgstr "所新增的路徑項目是 '%s'"
 
-#: quantum/agent/l3_agent.py:704
+#: neutron/agent/l3_agent.py:707
 #, python-format
 msgid "Removed route entry is '%s'"
 msgstr "所移除的路徑項目是 '%s'"
 
-#: quantum/agent/netns_cleanup_util.py:62
+#: neutron/agent/netns_cleanup_util.py:62
 msgid "Delete the namespace by removing all devices."
 msgstr "透過移除所有裝置來刪除名稱空間。"
 
-#: quantum/agent/netns_cleanup_util.py:123
+#: neutron/agent/netns_cleanup_util.py:123
 #, python-format
 msgid "Unable to find bridge for device: %s"
 msgstr "找不到裝置的橋接器：%s"
 
-#: quantum/agent/netns_cleanup_util.py:147
+#: neutron/agent/netns_cleanup_util.py:147
 #, python-format
 msgid "Error unable to destroy namespace: %s"
 msgstr "發生錯誤，無法毀損名稱空間：%s"
 
-#: quantum/agent/ovs_cleanup_util.py:41
+#: neutron/agent/ovs_cleanup_util.py:41
 msgid ""
 "True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Quantum on integration and external network bridges."
+"ports created by Neutron on integration and external network bridges."
 msgstr ""
-"如果為 True，則刪除所有 OpenvSwitch 橋接器上的所有埠。如果為 False，則刪除 Quantum "
-"在整合及外部網路橋接器上建立的埠。"
 
-#: quantum/agent/ovs_cleanup_util.py:73
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:428
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:249
+#: neutron/agent/ovs_cleanup_util.py:73
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:428
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:250
 #, python-format
 msgid "Delete %s"
 msgstr "刪除 %s"
 
-#: quantum/agent/ovs_cleanup_util.py:103
+#: neutron/agent/ovs_cleanup_util.py:103
 #, python-format
 msgid "Cleaning %s"
 msgstr "正在清除 %s"
 
-#: quantum/agent/ovs_cleanup_util.py:110
+#: neutron/agent/ovs_cleanup_util.py:110
 msgid "OVS cleanup completed successfully"
 msgstr "已順利完成 OVS 清理"
 
-#: quantum/agent/securitygroups_rpc.py:44
+#: neutron/agent/securitygroups_rpc.py:44
 msgid "Disabled security-group extension."
 msgstr "已停用安全群組延伸。"
 
-#: quantum/agent/securitygroups_rpc.py:51
+#: neutron/agent/securitygroups_rpc.py:51
 #, python-format
 msgid "Get security group rules for devices via rpc %r"
 msgstr "透過 RPC %r 來取得裝置的安全群組規則"
 
-#: quantum/agent/securitygroups_rpc.py:74
+#: neutron/agent/securitygroups_rpc.py:74
 #, python-format
 msgid "Security group rule updated on remote: %s"
 msgstr "已在遠端 %s 上更新安全群組規則"
 
-#: quantum/agent/securitygroups_rpc.py:84
+#: neutron/agent/securitygroups_rpc.py:84
 #, python-format
 msgid "Security group member updated on remote: %s"
 msgstr "已在遠端 %s 上更新安全群組成員"
 
-#: quantum/agent/securitygroups_rpc.py:89
-#: quantum/agent/securitygroups_rpc.py:137
+#: neutron/agent/securitygroups_rpc.py:89
+#: neutron/agent/securitygroups_rpc.py:137
 msgid "Provider rule updated"
 msgstr "已更新提供者規則"
 
-#: quantum/agent/securitygroups_rpc.py:100
+#: neutron/agent/securitygroups_rpc.py:100
 #, python-format
 msgid "Init firewall settings (driver=%s)"
 msgstr "起始防火牆設定（驅動程式 = %s）"
 
-#: quantum/agent/securitygroups_rpc.py:106
+#: neutron/agent/securitygroups_rpc.py:106
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr "正在準備裝置 %s 的過濾器"
 
-#: quantum/agent/securitygroups_rpc.py:114
+#: neutron/agent/securitygroups_rpc.py:114
 #, python-format
 msgid "Security group rule updated %r"
 msgstr "安全群組規則已更新 %r"
 
-#: quantum/agent/securitygroups_rpc.py:121
+#: neutron/agent/securitygroups_rpc.py:121
 #, python-format
 msgid "Security group member updated %r"
 msgstr "安全群組成員已更新 %r"
 
-#: quantum/agent/securitygroups_rpc.py:143
+#: neutron/agent/securitygroups_rpc.py:143
 #, python-format
 msgid "Remove device filter for %r"
 msgstr "移除 %r 的裝置過濾器"
 
-#: quantum/agent/securitygroups_rpc.py:152
+#: neutron/agent/securitygroups_rpc.py:152
 msgid "Refresh firewall rules"
 msgstr "重新整理防火牆規則"
 
-#: quantum/agent/securitygroups_rpc.py:160
+#: neutron/agent/securitygroups_rpc.py:160
 #, python-format
 msgid "Update port filter for %s"
 msgstr "更新 %s 的埠過濾器"
 
-#: quantum/agent/common/config.py:31
+#: neutron/agent/common/config.py:31
 msgid "Root helper application."
 msgstr "根說明程式應用程式。"
 
-#: quantum/agent/common/config.py:36
+#: neutron/agent/common/config.py:36
 msgid "Seconds between nodes reporting state to server"
 msgstr "兩個節點將狀態報告給伺服器的間隔秒數"
 
-#: quantum/agent/common/config.py:80
+#: neutron/agent/common/config.py:80
 msgid ""
 "DEFAULT.root_helper is deprecated! Please move root_helper configuration "
 "to [AGENT] section."
 msgstr ""
 
-#: quantum/agent/common/config.py:91
+#: neutron/agent/common/config.py:91
 msgid "Top-level directory for maintaining dhcp state"
 msgstr "用於維護 DHCP 狀態的最上層目錄"
 
-#: quantum/agent/linux/daemon.py:35
+#: neutron/agent/linux/daemon.py:35
 #, python-format
 msgid "Failed to open pidfile: %s"
 msgstr "無法開啟 pidfile：%s"
 
-#: quantum/agent/linux/daemon.py:42
+#: neutron/agent/linux/daemon.py:42
 msgid "Unable to lock pid file"
 msgstr "無法鎖定 PID 檔案"
 
-#: quantum/agent/linux/daemon.py:49
+#: neutron/agent/linux/daemon.py:49
 msgid "Unable to unlock pid file"
 msgstr "無法解除鎖定 PID 檔案"
 
-#: quantum/agent/linux/daemon.py:98
+#: neutron/agent/linux/daemon.py:98
 msgid "Fork failed"
 msgstr "分岔失敗"
 
-#: quantum/agent/linux/daemon.py:136
+#: neutron/agent/linux/daemon.py:136
 #, python-format
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr "pidfile %s 已存在。常駐程式已在執行中？"
 
-#: quantum/agent/linux/dhcp.py:40
+#: neutron/agent/linux/dhcp.py:40
 msgid "Location to store DHCP server config files"
 msgstr "DHCP 伺服器配置檔的儲存位置"
 
-#: quantum/agent/linux/dhcp.py:43
+#: neutron/agent/linux/dhcp.py:43
 msgid "Domain to use for building the hostnames"
 msgstr "用於建置主機名稱的網域"
 
-#: quantum/agent/linux/dhcp.py:46
+#: neutron/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr "使用此檔案來置換預設 dnsmasq 設定"
 
-#: quantum/agent/linux/dhcp.py:48
+#: neutron/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr "在 /etc/resolv.conf 中任何 DNS 伺服器之前使用另一個 DNS 伺服器。"
 
-#: quantum/agent/linux/dhcp.py:139
+#: neutron/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr "%(net_id)s pid %(pid)d 的 DHCP 已過時，正在忽略指令"
 
-#: quantum/agent/linux/dhcp.py:142
+#: neutron/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr "未給 %s 啟動 DHCP"
 
-#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
+#: neutron/agent/linux/dhcp.py:164 neutron/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr "讀取 %s 時發生錯誤"
 
-#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
+#: neutron/agent/linux/dhcp.py:171 neutron/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr "無法轉換 %s 中的值"
 
-#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
+#: neutron/agent/linux/dhcp.py:173 neutron/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr "無法存取 %s"
 
-#: quantum/agent/linux/dhcp.py:233
+#: neutron/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:238
+#: neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:326
+#: neutron/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr "由於所有子網路都已關閉 DHCP，所以正在結束網路的 dhcpmasq：%s"
 
-#: quantum/agent/linux/dhcp.py:336
+#: neutron/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:337
+#: neutron/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr "正在重新載入網路的配置：%s"
 
-#: quantum/agent/linux/external_process.py:32
+#: neutron/agent/linux/external_process.py:32
 msgid "Location to store child pid files"
 msgstr "子項 PID 檔案的儲存位置"
 
-#: quantum/agent/linux/external_process.py:67
+#: neutron/agent/linux/external_process.py:67
 #, python-format
 msgid "Process for %(uuid)s pid %(pid)d is stale, ignoring command"
 msgstr "%(uuid)s pid %(pid)d 的程序已過時，正在忽略指令"
 
-#: quantum/agent/linux/external_process.py:70
+#: neutron/agent/linux/external_process.py:70
 #, python-format
 msgid "No process started for %s"
 msgstr "未給 %s 啟動程序"
 
-#: quantum/agent/linux/interface.py:38
+#: neutron/agent/linux/interface.py:38
 msgid "Name of Open vSwitch bridge to use"
 msgstr "要使用的 Open vSwitch 橋接器名稱"
 
-#: quantum/agent/linux/interface.py:41
+#: neutron/agent/linux/interface.py:41
 msgid "Uses veth for an interface or not"
 msgstr "是否將 veth 用於介面"
 
-#: quantum/agent/linux/interface.py:43
+#: neutron/agent/linux/interface.py:43
 msgid "MTU setting for device."
 msgstr "裝置的 MTU 設定。"
 
-#: quantum/agent/linux/interface.py:45
+#: neutron/agent/linux/interface.py:45
 msgid "Mapping between flavor and LinuxInterfaceDriver"
 msgstr "在特性與 LinuxInterfaceDriver 之間進行對映"
 
-#: quantum/agent/linux/interface.py:47
+#: neutron/agent/linux/interface.py:47
 msgid "Admin username"
 msgstr "管理使用者名稱"
 
-#: quantum/agent/linux/interface.py:49 quantum/agent/metadata/agent.py:46
-#: quantum/plugins/metaplugin/common/config.py:40
+#: neutron/agent/linux/interface.py:49 neutron/agent/metadata/agent.py:46
+#: neutron/plugins/metaplugin/common/config.py:40
 msgid "Admin password"
 msgstr "管理者密碼"
 
-#: quantum/agent/linux/interface.py:52 quantum/agent/metadata/agent.py:49
-#: quantum/plugins/metaplugin/common/config.py:43
+#: neutron/agent/linux/interface.py:52 neutron/agent/metadata/agent.py:49
+#: neutron/plugins/metaplugin/common/config.py:43
 msgid "Admin tenant name"
 msgstr "管理者 Tenant 名稱"
 
-#: quantum/agent/linux/interface.py:54 quantum/agent/metadata/agent.py:51
-#: quantum/plugins/metaplugin/common/config.py:45
+#: neutron/agent/linux/interface.py:54 neutron/agent/metadata/agent.py:51
+#: neutron/plugins/metaplugin/common/config.py:45
 msgid "Authentication URL"
 msgstr "鑑別 URL"
 
-#: quantum/agent/linux/interface.py:56 quantum/agent/metadata/agent.py:53
-#: quantum/common/config.py:49 quantum/plugins/metaplugin/common/config.py:47
+#: neutron/agent/linux/interface.py:56 neutron/agent/metadata/agent.py:53
+#: neutron/common/config.py:50 neutron/plugins/metaplugin/common/config.py:47
 msgid "The type of authentication to use"
 msgstr "要使用的鑑別類型"
 
-#: quantum/agent/linux/interface.py:58 quantum/agent/metadata/agent.py:55
-#: quantum/plugins/metaplugin/common/config.py:49
+#: neutron/agent/linux/interface.py:58 neutron/agent/metadata/agent.py:55
+#: neutron/plugins/metaplugin/common/config.py:49
 msgid "Authentication region"
 msgstr "鑑別區域"
 
-#: quantum/agent/linux/interface.py:198 quantum/agent/linux/interface.py:267
-#: quantum/agent/linux/interface.py:316
+#: neutron/agent/linux/interface.py:198 neutron/agent/linux/interface.py:267
+#: neutron/agent/linux/interface.py:316
 #, python-format
 msgid "Device %s already exists"
 msgstr "裝置 %s 已存在"
 
-#: quantum/agent/linux/interface.py:216 quantum/agent/linux/interface.py:279
-#: quantum/agent/linux/interface.py:323
+#: neutron/agent/linux/interface.py:216 neutron/agent/linux/interface.py:279
+#: neutron/agent/linux/interface.py:323
 #, python-format
 msgid "Unplugged interface '%s'"
 msgstr "已拔除介面 '%s'"
 
-#: quantum/agent/linux/interface.py:218 quantum/agent/linux/interface.py:281
-#: quantum/agent/linux/interface.py:325
+#: neutron/agent/linux/interface.py:218 neutron/agent/linux/interface.py:281
+#: neutron/agent/linux/interface.py:325
 #, python-format
 msgid "Failed unplugging interface '%s'"
 msgstr "拔除介面 '%s' 時失敗"
 
-#: quantum/agent/linux/interface.py:383
+#: neutron/agent/linux/interface.py:383
 #, python-format
 msgid "Driver location: %s"
 msgstr "驅動程式位置：%s"
 
-#: quantum/agent/linux/ip_lib.py:27
+#: neutron/agent/linux/ip_lib.py:27
 msgid "Force ip_lib calls to use the root helper"
 msgstr ""
 
-#: quantum/agent/linux/ip_lib.py:425
+#: neutron/agent/linux/ip_lib.py:425
 msgid "No namespace defined for parent"
 msgstr "未給母項定義名稱空間"
 
-#: quantum/agent/linux/iptables_firewall.py:56
+#: neutron/agent/linux/iptables_firewall.py:56
 #, python-format
 msgid "Preparing device (%s) filter"
 msgstr "正在準備裝置 (%s) 過濾器"
 
-#: quantum/agent/linux/iptables_firewall.py:64
+#: neutron/agent/linux/iptables_firewall.py:64
 #, python-format
 msgid "Updating device (%s) filter"
 msgstr "正在更新裝置 (%s) 過濾器"
 
-#: quantum/agent/linux/iptables_firewall.py:66
+#: neutron/agent/linux/iptables_firewall.py:66
 #, python-format
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr "已嘗試更新未過濾的埠過濾器 %s"
 
-#: quantum/agent/linux/iptables_firewall.py:75
+#: neutron/agent/linux/iptables_firewall.py:75
 #, python-format
 msgid "Removing device (%s) filter"
 msgstr "正在移除裝置 (%s) 過濾器"
 
-#: quantum/agent/linux/iptables_firewall.py:77
+#: neutron/agent/linux/iptables_firewall.py:77
 #, python-format
 msgid "Attempted to remove port filter which is not filtered %r"
 msgstr "已嘗試移除未過濾的埠過濾器 %r"
 
-#: quantum/agent/linux/iptables_manager.py:139
+#: neutron/agent/linux/iptables_manager.py:139
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
 msgstr "已嘗試移除不存在的鏈 %s"
 
-#: quantum/agent/linux/iptables_manager.py:165
+#: neutron/agent/linux/iptables_manager.py:165
 #, python-format
 msgid "Unknown chain: %r"
 msgstr "不明鏈：%r"
 
-#: quantum/agent/linux/iptables_manager.py:189
+#: neutron/agent/linux/iptables_manager.py:189
 #, python-format
 msgid ""
 "Tried to remove rule that was not there: %(chain)r %(rule)r %(wrap)r "
 "%(top)r"
 msgstr "已嘗試移除不存在的規則：%(chain)r %(rule)r %(wrap)r %(top)r"
 
-#: quantum/agent/linux/iptables_manager.py:339
+#: neutron/agent/linux/iptables_manager.py:339
 msgid "IPTablesManager.apply completed with success"
 msgstr "已順利完成 IPTablesManager.apply"
 
-#: quantum/agent/linux/ovs_lib.py:71 quantum/agent/linux/ovs_lib.py:100
-#: quantum/agent/linux/ovs_lib.py:230
+#: neutron/agent/linux/ovs_lib.py:71 neutron/agent/linux/ovs_lib.py:100
+#: neutron/agent/linux/ovs_lib.py:230
 #, python-format
 msgid "Unable to execute %(cmd)s. Exception: %(exception)s"
 msgstr "無法執行 %(cmd)s。異常狀況：%(exception)s"
 
-#: quantum/agent/linux/ovs_lib.py:127
+#: neutron/agent/linux/ovs_lib.py:127
 msgid "Cannot match priority on flow deletion"
 msgstr "無法符合流程刪除作業上的優先順序"
 
-#: quantum/agent/linux/ovs_lib.py:151
+#: neutron/agent/linux/ovs_lib.py:151
 msgid "Must specify one or more actions"
 msgstr "必須指定一個以上的動作"
 
-#: quantum/agent/linux/ovs_lib.py:293
+#: neutron/agent/linux/ovs_lib.py:293
 #, python-format
 msgid "Unable to parse regex results. Exception: %s"
 msgstr "無法剖析 Regex 結果。異常狀況：%s"
 
-#: quantum/agent/linux/ovs_lib.py:311
+#: neutron/agent/linux/ovs_lib.py:311
 #, fuzzy, python-format
 msgid "Unable to determine mac address for %s"
 msgstr "嘗試 %s 次之後仍無法產生 MAC 位址"
 
-#: quantum/agent/linux/ovs_lib.py:320
+#: neutron/agent/linux/ovs_lib.py:320
 #, python-format
 msgid "Interface %s not found."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:329
+#: neutron/agent/linux/ovs_lib.py:329
 #, python-format
 msgid "Unable to retrieve bridges. Exception: %s"
 msgstr "無法擷取橋接器。異常狀況：%s"
 
-#: quantum/agent/linux/ovs_lib.py:340
+#: neutron/agent/linux/ovs_lib.py:340
 msgid "Unable to retrieve OVS userspace version."
 msgstr ""
 
-#: quantum/agent/linux/ovs_lib.py:352
+#: neutron/agent/linux/ovs_lib.py:352
 msgid "Unable to retrieve OVS kernel module version."
 msgstr ""
 
-#: quantum/agent/linux/utils.py:42
+#: neutron/agent/linux/utils.py:42
 #, python-format
 msgid "Running command: %s"
 msgstr "正在執行指令：%s"
 
-#: quantum/agent/linux/utils.py:56
+#: neutron/agent/linux/utils.py:56
 #, python-format
 msgid ""
 "\n"
@@ -989,742 +992,742 @@ msgstr ""
 "標準輸出：%(stdout)r\n"
 "標準錯誤：%(stderr)r"
 
-#: quantum/agent/metadata/agent.py:44
-#: quantum/plugins/metaplugin/common/config.py:38
+#: neutron/agent/metadata/agent.py:44
+#: neutron/plugins/metaplugin/common/config.py:38
 msgid "Admin user"
 msgstr "管理使用者"
 
-#: quantum/agent/metadata/agent.py:58
+#: neutron/agent/metadata/agent.py:58
 msgid "Network service endpoint type to pull from the keystone catalog"
 msgstr ""
 
-#: quantum/agent/metadata/agent.py:61
+#: neutron/agent/metadata/agent.py:61
 msgid "IP address used by Nova metadata server."
 msgstr "Nova meta 資料伺服器所使用的 IP 位址。"
 
-#: quantum/agent/metadata/agent.py:64
+#: neutron/agent/metadata/agent.py:64
 msgid "TCP Port used by Nova metadata server."
 msgstr "Nova meta 資料伺服器所使用的 TCP 埠。"
 
-#: quantum/agent/metadata/agent.py:67
+#: neutron/agent/metadata/agent.py:67
 msgid "Shared secret to sign instance-id request"
 msgstr "用於簽署 instance-id 要求的共用機密"
 
-#: quantum/agent/metadata/agent.py:92
-#: quantum/agent/metadata/namespace_proxy.py:75
+#: neutron/agent/metadata/agent.py:92
+#: neutron/agent/metadata/namespace_proxy.py:75
 #, python-format
 msgid "Request: %s"
 msgstr "要求：%s"
 
-#: quantum/agent/metadata/agent.py:101
-#: quantum/agent/metadata/namespace_proxy.py:83
+#: neutron/agent/metadata/agent.py:101
+#: neutron/agent/metadata/namespace_proxy.py:83
 msgid "Unexpected error."
 msgstr "非預期的錯誤。"
 
-#: quantum/agent/metadata/agent.py:102
-#: quantum/agent/metadata/namespace_proxy.py:84
+#: neutron/agent/metadata/agent.py:102
+#: neutron/agent/metadata/namespace_proxy.py:84
 msgid "An unknown error has occurred. Please try your request again."
 msgstr "發生不明錯誤。請重試要求。"
 
-#: quantum/agent/metadata/agent.py:154
+#: neutron/agent/metadata/agent.py:154
 msgid ""
 "The remote metadata server responded with Forbidden. This response "
 "usually occurs when shared secrets do not match."
 msgstr "遠端 meta 資料伺服器回應「已禁止」。此回應通常會在共用密碼不符時發生。"
 
-#: quantum/agent/metadata/agent.py:165
-#: quantum/agent/metadata/namespace_proxy.py:123
+#: neutron/agent/metadata/agent.py:165
+#: neutron/agent/metadata/namespace_proxy.py:123
 msgid "Remote metadata server experienced an internal server error."
 msgstr "遠端 meta 資料伺服器發生內部伺服器錯誤。"
 
-#: quantum/agent/metadata/agent.py:171
-#: quantum/agent/metadata/namespace_proxy.py:129
+#: neutron/agent/metadata/agent.py:171
+#: neutron/agent/metadata/namespace_proxy.py:129
 #, python-format
 msgid "Unexpected response code: %s"
 msgstr "非預期的回應碼：%s"
 
-#: quantum/agent/metadata/agent.py:209
+#: neutron/agent/metadata/agent.py:209
 msgid "Location for Metadata Proxy UNIX domain socket"
 msgstr "meta 資料 Proxy UNIX 網域 Socket 的位置"
 
-#: quantum/agent/metadata/namespace_proxy.py:36
+#: neutron/agent/metadata/namespace_proxy.py:36
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr "meta 資料 Proxy UNIX 網域 Socket 的位置"
 
-#: quantum/agent/metadata/namespace_proxy.py:70
+#: neutron/agent/metadata/namespace_proxy.py:70
 msgid "network_id and router_id are None. One must be provided."
 msgstr "network_id 及 router_id 皆為 None。必須提供其中一個。"
 
-#: quantum/agent/metadata/namespace_proxy.py:158
+#: neutron/agent/metadata/namespace_proxy.py:158
 msgid "TCP Port to listen for metadata server requests."
 msgstr "用於接聽 meta 資料伺服器要求的 TCP 埠。"
 
-#: quantum/api/api_common.py:103
+#: neutron/api/api_common.py:103
 #, python-format
 msgid ""
 "Invalid value for pagination_max_limit: %s. It should be an integer "
 "greater to 0"
 msgstr "pagination_max_limit 的值無效：%s。它應該是大於 0 的整數"
 
-#: quantum/api/api_common.py:117
+#: neutron/api/api_common.py:117
 #, python-format
 msgid "Limit must be an integer 0 or greater and not '%d'"
 msgstr "限制值必須是大於或等於 0 的整數，而不是 '%d'"
 
-#: quantum/api/api_common.py:134
+#: neutron/api/api_common.py:134
 msgid "The number of sort_keys and sort_dirs must be same"
 msgstr "sort_key 數目及 sort_dir 數目必須相同"
 
-#: quantum/api/api_common.py:139
+#: neutron/api/api_common.py:139
 #, python-format
 msgid "%s is invalid attribute for sort_keys"
 msgstr "對於 sort_key 來說，%s 是無效的屬性"
 
-#: quantum/api/api_common.py:143
+#: neutron/api/api_common.py:143
 #, python-format
 msgid ""
 "%(invalid_dirs)s is invalid value for sort_dirs, valid value is '%(asc)s'"
 " and '%(desc)s'"
 msgstr "對於 sort_dir 來說，%(invalid_dirs)s 是無效值，有效值為 '%(asc)s' 及 '%(desc)s'"
 
-#: quantum/api/api_common.py:317 quantum/api/v2/base.py:547
+#: neutron/api/api_common.py:317 neutron/api/v2/base.py:547
 #, python-format
 msgid "Unable to find '%s' in request body"
 msgstr "在要求內文中找不到 '%s'"
 
-#: quantum/api/api_common.py:324
+#: neutron/api/api_common.py:324
 #, python-format
 msgid "Failed to parse request. Parameter '%s' not specified"
 msgstr "無法剖析要求。未指定參數 '%s'"
 
-#: quantum/api/extensions.py:248
+#: neutron/api/extensions.py:248
 #, python-format
 msgid "Extension with alias %s does not exist"
 msgstr "別名為 %s 的延伸不存在"
 
-#: quantum/api/extensions.py:277
+#: neutron/api/extensions.py:277
 #, python-format
 msgid "Extended resource: %s"
 msgstr "已延伸資源：%s"
 
-#: quantum/api/extensions.py:299
+#: neutron/api/extensions.py:299
 #, python-format
 msgid "Extended action: %s"
 msgstr "已延伸動作：%s"
 
-#: quantum/api/extensions.py:307
+#: neutron/api/extensions.py:307
 #, python-format
 msgid "Extended request: %s"
 msgstr "已延伸要求：%s"
 
-#: quantum/api/extensions.py:398
+#: neutron/api/extensions.py:398
 msgid "Initializing extension manager."
 msgstr "正在起始設定延伸管理程式。"
 
-#: quantum/api/extensions.py:480
+#: neutron/api/extensions.py:480
 #, python-format
 msgid "Error fetching extended attributes for extension '%s'"
 msgstr "提取延伸 '%s' 的延伸屬性時發生錯誤"
 
-#: quantum/api/extensions.py:489
+#: neutron/api/extensions.py:489
 #, python-format
 msgid ""
 "It was impossible to process the following extensions: %s because of "
 "missing requirements."
 msgstr ""
 
-#: quantum/api/extensions.py:500
+#: neutron/api/extensions.py:500
 #, python-format
 msgid "Ext name: %s"
 msgstr "延伸名稱：%s"
 
-#: quantum/api/extensions.py:501
+#: neutron/api/extensions.py:501
 #, python-format
 msgid "Ext alias: %s"
 msgstr "延伸別名：%s"
 
-#: quantum/api/extensions.py:502
+#: neutron/api/extensions.py:502
 #, python-format
 msgid "Ext description: %s"
 msgstr "延伸說明：%s"
 
-#: quantum/api/extensions.py:503
+#: neutron/api/extensions.py:503
 #, python-format
 msgid "Ext namespace: %s"
 msgstr "延伸名稱空間：%s"
 
-#: quantum/api/extensions.py:504
+#: neutron/api/extensions.py:504
 #, python-format
 msgid "Ext updated: %s"
 msgstr "已更新延伸：%s"
 
-#: quantum/api/extensions.py:506 quantum/api/extensions.py:512
+#: neutron/api/extensions.py:506 neutron/api/extensions.py:512
 #, python-format
 msgid "Exception loading extension: %s"
 msgstr "載入延伸時發生異常狀況：%s"
 
-#: quantum/api/extensions.py:532
+#: neutron/api/extensions.py:532
 #, python-format
 msgid "Extension path '%s' doesn't exist!"
 msgstr "延伸路徑 '%s' 不存在！"
 
-#: quantum/api/extensions.py:537
+#: neutron/api/extensions.py:537
 #, python-format
 msgid "Loading extension file: %s"
 msgstr "正在載入延伸檔：%s"
 
-#: quantum/api/extensions.py:545
+#: neutron/api/extensions.py:545
 #, python-format
 msgid "Did not find expected name \"%(ext_name)s\" in %(file)s"
 msgstr "在 %(file)s 中找不到需要的名稱 \"%(ext_name)s\""
 
-#: quantum/api/extensions.py:553
+#: neutron/api/extensions.py:553
 #, python-format
 msgid "Extension file %(f)s wasn't loaded due to %(exception)s"
 msgstr "由於 %(exception)s 而未載入延伸檔 %(f)s"
 
-#: quantum/api/extensions.py:562
+#: neutron/api/extensions.py:562
 #, python-format
 msgid "Loaded extension: %s"
 msgstr "已載入延伸：%s"
 
-#: quantum/api/extensions.py:565
+#: neutron/api/extensions.py:565
 #, python-format
 msgid "Found duplicate extension: %s"
 msgstr "發現重複延伸：%s"
 
-#: quantum/api/extensions.py:595
+#: neutron/api/extensions.py:595
 #, python-format
 msgid "Extension %s not supported by any of loaded plugins"
 msgstr "所載入的任何外掛程式皆不支援延伸 %s"
 
-#: quantum/api/extensions.py:606
+#: neutron/api/extensions.py:606
 #, python-format
 msgid "Loaded plugins do not implement extension %s interface"
 msgstr "所載入的外掛程式未實作延伸 %s 介面"
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:37
 #, python-format
 msgid "Nofity agent at %(host)s the message %(method)s"
 msgstr "將訊息通知 %(method)s 傳送給位於 %(host)s 處的代理程式"
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:56
 #, python-format
 msgid "Notify agent at %(topic)s.%(host)s the message %(method)s"
 msgstr "將訊息通知 %(method)s 傳送給位於 %(topic)s.%(host)s 處的代理程式"
 
-#: quantum/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
+#: neutron/api/rpc/agentnotifiers/l3_rpc_agent_api.py:84
 #, python-format
 msgid ""
 "Fanout notify agent at %(topic)s the message %(method)s on router "
 "%(router_id)s"
 msgstr "在路由器 %(router_id)s 上展開：將訊息通知 %(method)s 傳送給位於 %(topic)s 處的代理程式"
 
-#: quantum/api/v2/attributes.py:43
+#: neutron/api/v2/attributes.py:43
 #, python-format
 msgid ""
 "Invalid input. '%(target_dict)s' must be a dictionary with keys: "
 "%(expected_keys)s"
 msgstr "無效的輸入。'%(target_dict)s' 必須是含有下列索引鍵的字典：%(expected_keys)s"
 
-#: quantum/api/v2/attributes.py:54
+#: neutron/api/v2/attributes.py:54
 #, python-format
 msgid ""
 "Validation of dictionary's keys failed.Expected keys: %(expected_keys)s "
 "Provided keys: %(provided_keys)s"
 msgstr "驗證字典索引鍵失敗。需要的索引鍵：%(expected_keys)s 提供的索引鍵：%(provided_keys)s"
 
-#: quantum/api/v2/attributes.py:68
+#: neutron/api/v2/attributes.py:68
 #, python-format
 msgid "'%(data)s' is not in %(valid_values)s"
 msgstr "'%(data)s' 不在 %(valid_values)s 中"
 
-#: quantum/api/v2/attributes.py:76
+#: neutron/api/v2/attributes.py:76
 #, python-format
 msgid "'%s' is not a valid string"
 msgstr "'%s' 不是有效字串"
 
-#: quantum/api/v2/attributes.py:81
+#: neutron/api/v2/attributes.py:81
 #, python-format
 msgid "'%(data)s' exceeds maximum length of %(max_len)s"
 msgstr "'%(data)s' 超出 %(max_len)s 的長度上限"
 
-#: quantum/api/v2/attributes.py:91
+#: neutron/api/v2/attributes.py:91
 #, fuzzy, python-format
 msgid "'%s' is not a valid boolean value"
 msgstr "'%s' 不是有效的輸入"
 
-#: quantum/api/v2/attributes.py:100
+#: neutron/api/v2/attributes.py:100
 #, python-format
 msgid "'%(data)s' is not in range %(min_value)s through %(max_value)s"
 msgstr "'%(data)s' 不在 %(min_value)s 到 %(max_value)s 的範圍內"
 
-#: quantum/api/v2/attributes.py:111
+#: neutron/api/v2/attributes.py:111
 #, python-format
 msgid "'%s' contains whitespace"
 msgstr ""
 
-#: quantum/api/v2/attributes.py:121
+#: neutron/api/v2/attributes.py:121
 #, python-format
 msgid "'%s' is not a valid MAC address"
 msgstr "'%s' 不是有效的 MAC 位址"
 
-#: quantum/api/v2/attributes.py:130
+#: neutron/api/v2/attributes.py:130
 #, python-format
 msgid "'%s' is not a valid IP address"
 msgstr "'%s' 不是有效的 IP 位址"
 
-#: quantum/api/v2/attributes.py:141
+#: neutron/api/v2/attributes.py:141
 #, python-format
 msgid "Invalid data format for IP pool: '%s'"
 msgstr "IP 儲存區的資料格式無效：'%s'"
 
-#: quantum/api/v2/attributes.py:160 quantum/api/v2/attributes.py:167
+#: neutron/api/v2/attributes.py:160 neutron/api/v2/attributes.py:167
 #, python-format
 msgid "Invalid data format for fixed IP: '%s'"
 msgstr "固定 IP 的資料格式無效：'%s'"
 
-#: quantum/api/v2/attributes.py:175
+#: neutron/api/v2/attributes.py:175
 #, python-format
 msgid "Duplicate IP address '%s'"
 msgstr "重複的 IP 位址 '%s'"
 
-#: quantum/api/v2/attributes.py:191
+#: neutron/api/v2/attributes.py:191
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr "名稱伺服器的資料格式無效：'%s'"
 
-#: quantum/api/v2/attributes.py:202
+#: neutron/api/v2/attributes.py:202
 #, python-format
 msgid "'%s' is not a valid nameserver"
 msgstr "'%s' 不是有效的名稱伺服器"
 
-#: quantum/api/v2/attributes.py:206
+#: neutron/api/v2/attributes.py:206
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr "重複的名稱伺服器 '%s'"
 
-#: quantum/api/v2/attributes.py:214
+#: neutron/api/v2/attributes.py:214
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr "主機路徑的資料格式無效：'%s'"
 
-#: quantum/api/v2/attributes.py:234
+#: neutron/api/v2/attributes.py:234
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr "重複的主機路徑 '%s'"
 
-#: quantum/api/v2/attributes.py:254
+#: neutron/api/v2/attributes.py:254
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr "'%s' 不是有效的 IP 子網路"
 
-#: quantum/api/v2/attributes.py:266
+#: neutron/api/v2/attributes.py:266
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr "'%s' 不是有效的輸入"
 
-#: quantum/api/v2/attributes.py:273
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr "'%s' 不是有效的 UUID"
 
-#: quantum/api/v2/attributes.py:285
+#: neutron/api/v2/attributes.py:285
 #, python-format
 msgid "'%s' is not a list"
 msgstr "'%s' 不是清單"
 
-#: quantum/api/v2/attributes.py:296
+#: neutron/api/v2/attributes.py:296
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr "清單中的重複項目：'%s'"
 
-#: quantum/api/v2/attributes.py:303
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr "'%s' 不是字典"
 
-#: quantum/api/v2/attributes.py:328
+#: neutron/api/v2/attributes.py:328
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr "驗證器 '%s' 不存在。"
 
-#: quantum/api/v2/attributes.py:360
+#: neutron/api/v2/attributes.py:360
 #, python-format
 msgid "'%s' is not an integer"
 msgstr "'%s' 不是整數"
 
-#: quantum/api/v2/attributes.py:365
+#: neutron/api/v2/attributes.py:365
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr "'%s' 應該為非負數"
 
-#: quantum/api/v2/attributes.py:384
+#: neutron/api/v2/attributes.py:384
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr "無法將 '%s' 轉換為布林值"
 
-#: quantum/api/v2/attributes.py:392
+#: neutron/api/v2/attributes.py:392
 #, python-format
 msgid "'%s' is not a integer"
 msgstr "'%s' 不是整數"
 
-#: quantum/api/v2/attributes.py:405
+#: neutron/api/v2/attributes.py:405
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr "'%s' 的格式不是 <key>=[value]"
 
-#: quantum/api/v2/base.py:78
+#: neutron/api/v2/base.py:78
 msgid "Native pagination depend on native sorting"
 msgstr "原生分頁相依於原生排序"
 
-#: quantum/api/v2/base.py:81
+#: neutron/api/v2/base.py:81
 msgid "Allow sorting is enabled because native pagination requires native sorting"
 msgstr "已啟用容許排序，因為原生分頁需要原生排序"
 
-#: quantum/api/v2/base.py:134
+#: neutron/api/v2/base.py:134
 #, python-format
 msgid ""
 "The resource %(resource)s was not found in the RESOURCE_ATTRIBUTE_MAP; "
 "unable to perform authZ check for attribute %(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:140
+#: neutron/api/v2/base.py:140
 #, python-format
 msgid ""
 "Policy rule:%(action)s not found. Assuming no authZ check is defined for "
 "%(attr)s"
 msgstr ""
 
-#: quantum/api/v2/base.py:319
+#: neutron/api/v2/base.py:319
 #, python-format
 msgid "Unable to undo add for %(resource)s %(id)s"
 msgstr "無法復原新增 %(resource)s %(id)s"
 
-#: quantum/api/v2/base.py:447
+#: neutron/api/v2/base.py:447
 #, python-format
 msgid "Invalid format: %s"
 msgstr "無效的格式：%s"
 
-#: quantum/api/v2/base.py:501
+#: neutron/api/v2/base.py:501
 msgid ""
 "Specifying 'tenant_id' other than authenticated tenant in request "
 "requires admin privileges"
 msgstr "在要求中指定已鑑別 Tenant 之外的 'tenant_id' 時需要管理者專用權"
 
-#: quantum/api/v2/base.py:509
+#: neutron/api/v2/base.py:509
 #, fuzzy
 msgid "Running without keystone AuthN requires  that tenant_id is specified"
 msgstr "在沒有金鑰儲存庫 AuthN 的情況下執行需要指定 tenant_id"
 
-#: quantum/api/v2/base.py:527
+#: neutron/api/v2/base.py:527
 msgid "Resource body required"
 msgstr "需要資源主體"
 
-#: quantum/api/v2/base.py:538
+#: neutron/api/v2/base.py:538
 msgid "Bulk operation not supported"
 msgstr "不支援主體作業"
 
-#: quantum/api/v2/base.py:542
+#: neutron/api/v2/base.py:542
 msgid "Resources required"
 msgstr "需要資源"
 
-#: quantum/api/v2/base.py:559
+#: neutron/api/v2/base.py:559
 #, python-format
 msgid "Failed to parse request. Required attribute '%s' not specified"
 msgstr "無法剖析要求。未指定必要屬性 '%s'"
 
-#: quantum/api/v2/base.py:566
+#: neutron/api/v2/base.py:566
 #, python-format
 msgid "Attribute '%s' not allowed in POST"
 msgstr "POST 中不接受屬性 '%s'"
 
-#: quantum/api/v2/base.py:571
+#: neutron/api/v2/base.py:571
 #, python-format
 msgid "Cannot update read-only attribute %s"
 msgstr "無法更新唯讀屬性 %s"
 
-#: quantum/api/v2/base.py:589
+#: neutron/api/v2/base.py:589
 #, python-format
 msgid "Invalid input for %(attr)s. Reason: %(reason)s."
 msgstr "%(attr)s 的輸入無效。原因：%(reason)s。"
 
-#: quantum/api/v2/base.py:598
+#: neutron/api/v2/base.py:598
 #, python-format
 msgid "Unrecognized attribute(s) '%s'"
 msgstr "無法辨識屬性 '%s'"
 
-#: quantum/api/v2/base.py:616
+#: neutron/api/v2/base.py:616
 #, python-format
 msgid "Tenant %(tenant_id)s not allowed to create %(resource)s on this network"
 msgstr "Tenant %(tenant_id)s 不可在此網路上建立 %(resource)s"
 
-#: quantum/api/v2/resource.py:85 quantum/api/v2/resource.py:93
-#: quantum/api/v2/resource.py:99
+#: neutron/api/v2/resource.py:85 neutron/api/v2/resource.py:93
+#: neutron/api/v2/resource.py:110
 #, python-format
 msgid "%s failed"
 msgstr "%s 失敗"
 
-#: quantum/api/v2/resource.py:101
-#: quantum/tests/unit/test_api_v2_resource.py:191
-#: quantum/tests/unit/test_api_v2_resource.py:207
+#: neutron/api/v2/resource.py:112
+#: neutron/tests/unit/test_api_v2_resource.py:191
+#: neutron/tests/unit/test_api_v2_resource.py:207
 msgid "Request Failed: internal server error while processing your request."
 msgstr "要求失敗：處理要求時發生內部伺服器錯誤。"
 
-#: quantum/common/config.py:39
+#: neutron/common/config.py:40
 msgid "The host IP to bind to"
 msgstr "要連結至的主機 IP"
 
-#: quantum/common/config.py:41
+#: neutron/common/config.py:42
 msgid "The port to bind to"
 msgstr "要連結至的埠"
 
-#: quantum/common/config.py:43
+#: neutron/common/config.py:44
 msgid "The API paste config file to use"
 msgstr "要使用的 API 貼上配置檔"
 
-#: quantum/common/config.py:45
+#: neutron/common/config.py:46
 msgid "The path for API extensions"
 msgstr "API 延伸的路徑"
 
-#: quantum/common/config.py:47
+#: neutron/common/config.py:48
 msgid "The policy file to use"
 msgstr "要使用的原則檔"
 
-#: quantum/common/config.py:51
-msgid "The core plugin Quantum will use"
-msgstr "Quantum 將使用的核心外掛程式"
+#: neutron/common/config.py:52
+msgid "The core plugin Neutron will use"
+msgstr ""
 
-#: quantum/common/config.py:53
-msgid "The service plugins Quantum will use"
-msgstr "Quantum 將使用的服務外掛程式"
+#: neutron/common/config.py:54
+msgid "The service plugins Neutron will use"
+msgstr ""
 
-#: quantum/common/config.py:55
-msgid "The base MAC address Quantum will use for VIFs"
-msgstr "Quantum 將用於 VIF 的基本 MAC 位址"
+#: neutron/common/config.py:56
+msgid "The base MAC address Neutron will use for VIFs"
+msgstr ""
 
-#: quantum/common/config.py:57
-msgid "How many times Quantum will retry MAC generation"
-msgstr "Quantum 將重試 MAC 產生作業的次數"
+#: neutron/common/config.py:58
+msgid "How many times Neutron will retry MAC generation"
+msgstr ""
 
-#: quantum/common/config.py:59
+#: neutron/common/config.py:60
 msgid "Allow the usage of the bulk API"
 msgstr "容許使用主體 API"
 
-#: quantum/common/config.py:61
+#: neutron/common/config.py:62
 msgid "Allow the usage of the pagination"
 msgstr "容許使用分頁"
 
-#: quantum/common/config.py:63
+#: neutron/common/config.py:64
 msgid "Allow the usage of the sorting"
 msgstr "容許使用排序"
 
-#: quantum/common/config.py:65
+#: neutron/common/config.py:66
 msgid ""
 "The maximum number of items returned in a single response, value was "
 "'infinite' or negative integer means no limit"
 msgstr "在單一回應中傳回的項目數上限，值為 'infinite' 或負整數時表示無限制"
 
-#: quantum/common/config.py:69
+#: neutron/common/config.py:70
 msgid "Maximum number of DNS nameservers"
 msgstr "DNS 名稱伺服器的數目上限"
 
-#: quantum/common/config.py:71
+#: neutron/common/config.py:72
 msgid "Maximum number of host routes per subnet"
 msgstr "每個子網路的主機路徑數目上限"
 
-#: quantum/common/config.py:73
+#: neutron/common/config.py:74
 msgid "Maximum number of fixed ips per port"
 msgstr "每個埠的固定 IP 數目上限"
 
-#: quantum/common/config.py:76
+#: neutron/common/config.py:77
 msgid "DHCP lease duration"
 msgstr "DHCP 租賃期間"
 
-#: quantum/common/config.py:78
+#: neutron/common/config.py:79
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr "容許將資源作業通知傳送給 DHCP 代理程式"
 
-#: quantum/common/config.py:81
-msgid "Allow overlapping IP support in Quantum"
-msgstr "容許 Quantum 中的重疊 IP 支援"
+#: neutron/common/config.py:82
+msgid "Allow overlapping IP support in Neutron"
+msgstr ""
 
-#: quantum/common/config.py:83
-msgid "The hostname Quantum is running on"
-msgstr "Quantum 正在其中執行的主機名稱"
+#: neutron/common/config.py:84
+msgid "The hostname Neutron is running on"
+msgstr ""
 
-#: quantum/common/config.py:85
+#: neutron/common/config.py:86
 msgid "Ensure that configured gateway is on subnet"
 msgstr "請確保所配置的閘道位於子網路上"
 
-#: quantum/common/config.py:114
+#: neutron/common/config.py:117
 #, python-format
 msgid "Base MAC: %s"
 msgstr "基本 MAC：%s"
 
-#: quantum/common/config.py:125
+#: neutron/common/config.py:128
 msgid "Logging enabled!"
 msgstr "已啟用記載！"
 
-#: quantum/common/config.py:138
+#: neutron/common/config.py:141
 #, python-format
 msgid "Config paste file: %s"
 msgstr "配置貼上檔案：%s"
 
-#: quantum/common/config.py:143
+#: neutron/common/config.py:146
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr "無法從配置檔 %(config_path)s 載入 %(app_name)s。"
 
-#: quantum/common/exceptions.py:34 quantum/plugins/nicira/NvpApiClient.py:198
+#: neutron/common/exceptions.py:34 neutron/plugins/nicira/NvpApiClient.py:198
 msgid "An unknown exception occurred."
 msgstr "發生不明異常狀況。"
 
-#: quantum/common/exceptions.py:38
+#: neutron/common/exceptions.py:38
 #, python-format
 msgid "Bad %(resource)s request: %(msg)s"
 msgstr "錯誤的 %(resource)s 要求：%(msg)s"
 
-#: quantum/common/exceptions.py:50
+#: neutron/common/exceptions.py:50
 msgid "Not authorized."
 msgstr "未獲授權。"
 
-#: quantum/common/exceptions.py:54
+#: neutron/common/exceptions.py:54
 msgid "The service is unailable"
 msgstr "服務無法使用"
 
-#: quantum/common/exceptions.py:58
+#: neutron/common/exceptions.py:58
 #, python-format
 msgid "User does not have admin privileges: %(reason)s"
 msgstr "使用者沒有管理者專用權：%(reason)s"
 
-#: quantum/common/exceptions.py:62
+#: neutron/common/exceptions.py:62
 #, python-format
 msgid "Policy doesn't allow %(action)s to be performed."
 msgstr "原則不容許執行 %(action)s。"
 
-#: quantum/common/exceptions.py:66
+#: neutron/common/exceptions.py:66
 #, python-format
 msgid "Network %(net_id)s could not be found"
 msgstr "找不到網路 %(net_id)s"
 
-#: quantum/common/exceptions.py:70
+#: neutron/common/exceptions.py:70
 #, python-format
 msgid "Subnet %(subnet_id)s could not be found"
 msgstr "找不到子網路 %(subnet_id)s"
 
-#: quantum/common/exceptions.py:74
+#: neutron/common/exceptions.py:74
 #, python-format
 msgid "Port %(port_id)s could not be found on network %(net_id)s"
 msgstr "在網路 %(net_id)s 上找不到埠 %(port_id)s"
 
-#: quantum/common/exceptions.py:79
+#: neutron/common/exceptions.py:79
 msgid "Policy configuration policy.json could not be found"
 msgstr "找不到原則配置 policy.json 檔"
 
-#: quantum/common/exceptions.py:83
+#: neutron/common/exceptions.py:83
 #, python-format
 msgid "Requested rule:%(rule)s cannot be found"
 msgstr ""
 
-#: quantum/common/exceptions.py:87
+#: neutron/common/exceptions.py:87
 #, python-format
 msgid "Failed to init policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:91
+#: neutron/common/exceptions.py:91
 #, python-format
 msgid "Failed to check policy %(policy)s because %(reason)s"
 msgstr ""
 
-#: quantum/common/exceptions.py:95
+#: neutron/common/exceptions.py:95
 #, python-format
 msgid "Unsupported port state: %(port_state)s"
 msgstr "不支援的埠狀態：%(port_state)s"
 
-#: quantum/common/exceptions.py:99
+#: neutron/common/exceptions.py:99
 msgid "The resource is inuse"
 msgstr "資源已在使用中"
 
-#: quantum/common/exceptions.py:103
+#: neutron/common/exceptions.py:103
 #, python-format
 msgid ""
 "Unable to complete operation on network %(net_id)s. There are one or more"
 " ports still in use on the network."
 msgstr "無法對網路 %(net_id)s 完成作業。網路上有一個以上的埠仍在使用中。"
 
-#: quantum/common/exceptions.py:108
+#: neutron/common/exceptions.py:108
 #, python-format
 msgid ""
 "Unable to complete operation on subnet %(subnet_id)s. One or more ports "
 "have an IP allocation from this subnet."
 msgstr "無法對子網路 %(subnet_id)s 完成作業。一個以上的埠具有從此子網路配置的 IP。"
 
-#: quantum/common/exceptions.py:113
+#: neutron/common/exceptions.py:113
 #, python-format
 msgid ""
 "Unable to complete operation on port %(port_id)s for network %(net_id)s. "
 "Port already has an attacheddevice %(device_id)s."
 msgstr "無法對網路 %(net_id)s 的埠 %(port_id)s 完成作業。埠已連接了裝置 %(device_id)s。"
 
-#: quantum/common/exceptions.py:119
+#: neutron/common/exceptions.py:119
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The mac address "
 "%(mac)s is in use."
 msgstr "無法對網路 %(net_id)s 完成作業。MAC 位址 %(mac)s 正在使用中。"
 
-#: quantum/common/exceptions.py:125
+#: neutron/common/exceptions.py:125
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of host routes"
 " exceeds the limit %(quota)s."
 msgstr "無法對 %(subnet_id)s 完成作業。主機路徑數目超出限制 %(quota)s。"
 
-#: quantum/common/exceptions.py:131
+#: neutron/common/exceptions.py:131
 #, python-format
 msgid ""
 "Unable to complete operation for %(subnet_id)s. The number of DNS "
 "nameservers exceeds the limit %(quota)s."
 msgstr "無法對 %(subnet_id)s 完成作業。DNS 名稱伺服器的數目超出限制 %(quota)s。"
 
-#: quantum/common/exceptions.py:136
+#: neutron/common/exceptions.py:136
 #, python-format
 msgid ""
 "Unable to complete operation for network %(net_id)s. The IP address "
 "%(ip_address)s is in use."
 msgstr "無法對網路 %(net_id)s 完成作業。IP 位址 %(ip_address)s 正在使用中。"
 
-#: quantum/common/exceptions.py:141
+#: neutron/common/exceptions.py:141
 #, python-format
 msgid ""
 "Unable to create the network. The VLAN %(vlan_id)s on physical network "
 "%(physical_network)s is in use."
 msgstr "無法建立網路。實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s 正在使用中。"
 
-#: quantum/common/exceptions.py:147
+#: neutron/common/exceptions.py:147
 #, python-format
 msgid ""
 "Unable to create the flat network. Physical network %(physical_network)s "
 "is in use."
 msgstr "無法建立平面網路。實體網路 %(physical_network)s 正在使用中。"
 
-#: quantum/common/exceptions.py:152
+#: neutron/common/exceptions.py:152
 #, python-format
 msgid "Unable to create the network. The tunnel ID %(tunnel_id)s is in use."
 msgstr "無法建立網路。通道 ID %(tunnel_id)s 正在使用中。"
 
-#: quantum/common/exceptions.py:157
+#: neutron/common/exceptions.py:157
 msgid "Tenant network creation is not enabled."
 msgstr "未啟用 Tenant 網路建立作業。"
 
-#: quantum/common/exceptions.py:165
+#: neutron/common/exceptions.py:165
 msgid ""
 "Unable to create the network. No tenant network is available for "
 "allocation."
 msgstr "無法建立網路。沒有可用於配置的 Tenant 網路。"
 
-#: quantum/common/exceptions.py:170
+#: neutron/common/exceptions.py:170
 #, python-format
 msgid ""
 "Unable to plug the attachment %(att_id)s into port %(port_id)s for "
@@ -1734,452 +1737,462 @@ msgstr ""
 "無法將連接裝置 %(att_id)s 插入網路 %(net_id)s 的埠 %(port_id)s。該連接裝置已插入埠 "
 "%(att_port_id)s"
 
-#: quantum/common/exceptions.py:176
+#: neutron/common/exceptions.py:176
 #, python-format
 msgid ""
 "Subnet on port %(port_id)s does not match the requested subnet "
 "%(subnet_id)s"
 msgstr "埠 %(port_id)s 上的子網路與所要求的子網路 %(subnet_id)s 不符"
 
-#: quantum/common/exceptions.py:181
+#: neutron/common/exceptions.py:181
 #, python-format
 msgid "Malformed request body: %(reason)s"
 msgstr "要求內文的格式不正確：%(reason)s"
 
-#: quantum/common/exceptions.py:189
+#: neutron/common/exceptions.py:189
 #, python-format
 msgid "Invalid input for operation: %(error_message)s."
 msgstr "作業的輸入無效：%(error_message)s。"
 
-#: quantum/common/exceptions.py:193
+#: neutron/common/exceptions.py:193
 #, python-format
 msgid "The allocation pool %(pool)s is not valid."
 msgstr "配置儲存區 %(pool)s 無效。"
 
-#: quantum/common/exceptions.py:197
+#: neutron/common/exceptions.py:197
 #, python-format
 msgid ""
 "Found overlapping allocation pools:%(pool_1)s %(pool_2)s for subnet "
 "%(subnet_cidr)s."
 msgstr "發現子網路 %(subnet_cidr)s 的配置儲存區 %(pool_1)s 及 %(pool_2)s 重疊。"
 
-#: quantum/common/exceptions.py:202
+#: neutron/common/exceptions.py:202
 #, python-format
 msgid "The allocation pool %(pool)s spans beyond the subnet cidr %(subnet_cidr)s."
 msgstr "配置儲存區 %(pool)s 跨越了子網路 CIDR %(subnet_cidr)s。"
 
-#: quantum/common/exceptions.py:211
+#: neutron/common/exceptions.py:211
 #, python-format
 msgid "Unable to generate unique mac on network %(net_id)s."
 msgstr "無法在網路 %(net_id)s 上產生唯一 MAC 位址。"
 
-#: quantum/common/exceptions.py:215
+#: neutron/common/exceptions.py:215
 #, python-format
 msgid "No more IP addresses available on network %(net_id)s."
 msgstr "網路 %(net_id)s 上沒有更多的可用 IP 位址。"
 
-#: quantum/common/exceptions.py:219
+#: neutron/common/exceptions.py:219
 #, python-format
 msgid "Bridge %(bridge)s does not exist."
 msgstr "橋接器 %(bridge)s 不存在。"
 
-#: quantum/common/exceptions.py:223
+#: neutron/common/exceptions.py:223
 #, python-format
 msgid "Creation failed. %(dev_name)s already exists."
 msgstr "建立失敗。%(dev_name)s 已存在。"
 
-#: quantum/common/exceptions.py:227
+#: neutron/common/exceptions.py:227
 msgid "Sudo priviledge is required to run this command."
 msgstr "需要 Sudo 專用權才能執行此指令。"
 
-#: quantum/common/exceptions.py:231
+#: neutron/common/exceptions.py:231
 #, python-format
 msgid "Unknown quota resources %(unknown)s."
 msgstr "不明的配額資源 %(unknown)s。"
 
-#: quantum/common/exceptions.py:235
+#: neutron/common/exceptions.py:235
 #, python-format
 msgid "Quota exceeded for resources: %(overs)s"
 msgstr "資源已超出配額：%(overs)s"
 
-#: quantum/common/exceptions.py:239
+#: neutron/common/exceptions.py:239
 msgid "Tenant-id was missing from Quota request"
 msgstr "Quota 要求中遺漏了 Tenant-id"
 
-#: quantum/common/exceptions.py:243
+#: neutron/common/exceptions.py:243
 #, python-format
 msgid ""
 "Change would make usage less than 0 for the following resources: "
 "%(unders)s"
 msgstr "變更會使下列資源的用量小於 0：%(unders)s"
 
-#: quantum/common/exceptions.py:248
+#: neutron/common/exceptions.py:248
 #, python-format
 msgid ""
 "Unable to reconfigure sharing settings for network %(network)s. Multiple "
 "tenants are using it"
 msgstr "無法給網路 %(network)s 重新配置共用設定。多個 Tenant 正在使用該網路"
 
-#: quantum/common/exceptions.py:253
+#: neutron/common/exceptions.py:253
 #, python-format
 msgid "Invalid extension environment: %(reason)s"
 msgstr "無效的延伸環境：%(reason)s"
 
-#: quantum/common/exceptions.py:257
+#: neutron/common/exceptions.py:257
 #, fuzzy, python-format
 msgid "Unable to find any IP address on external network %(net_id)s."
 msgstr "在外部網路上找不到任何 IP 位址"
 
-#: quantum/common/exceptions.py:262
+#: neutron/common/exceptions.py:262
 msgid "More than one external network exists"
 msgstr "多個外部網路已存在"
 
-#: quantum/common/exceptions.py:266
+#: neutron/common/exceptions.py:266
 #, python-format
 msgid "An invalid value was provided for %(opt_name)s: %(opt_value)s"
 msgstr "提供給 %(opt_name)s 的值 %(opt_value)s 無效"
 
-#: quantum/common/exceptions.py:271
+#: neutron/common/exceptions.py:271
 #, python-format
 msgid "Gateway ip %(ip_address)s conflicts with allocation pool %(pool)s"
 msgstr "閘道 IP %(ip_address)s 與配置儲存區 %(pool)s 相衝突"
 
-#: quantum/common/exceptions.py:276
+#: neutron/common/exceptions.py:276
 #, python-format
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:55 quantum/openstack/common/fileutils.py:64
+#: neutron/common/legacy.py:33
+#, python-format
+msgid "Old class module path in use.  Please change '%(old)s' to '%(new)s'."
+msgstr ""
+
+#: neutron/common/legacy.py:51
+#, python-format
+msgid "Skipping unknown group key: %s"
+msgstr ""
+
+#: neutron/common/utils.py:55 neutron/openstack/common/fileutils.py:64
 #, python-format
 msgid "Reloading cached file %s"
 msgstr "正在重新載入快取檔 %s"
 
-#: quantum/common/utils.py:138
+#: neutron/common/utils.py:142
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr "無效的對映：'%s'"
 
-#: quantum/common/utils.py:141
+#: neutron/common/utils.py:145
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr "對映中遺漏了索引鍵：'%s'"
 
-#: quantum/common/utils.py:144
+#: neutron/common/utils.py:148
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr "對映中遺漏了值：'%s'"
 
-#: quantum/common/utils.py:146
+#: neutron/common/utils.py:150
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr "對映 '%(mapping)s' 中的索引鍵 %(key)s 不是唯一的"
 
-#: quantum/common/utils.py:149
+#: neutron/common/utils.py:153
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr "對映 '%(mapping)s' 中的值 %(value)s 不是唯一的"
 
-#: quantum/db/agents_db.py:33
+#: neutron/db/agents_db.py:33
 msgid "Seconds to regard the agent is down."
 msgstr "將代理程式視為已關閉的秒數。"
 
-#: quantum/db/agents_db.py:79
+#: neutron/db/agents_db.py:79
 #, python-format
 msgid "Configuration for agent %(agent_type)s on host %(host)s is invalid."
 msgstr "主機 %(host)s 上代理程式 %(agent_type)s 的配置無效。"
 
-#: quantum/db/agents_db.py:170
+#: neutron/db/agents_db.py:170
 msgid "Message with invalid timestamp received"
 msgstr "收到含有無效時間戳記的訊息"
 
-#: quantum/db/agentschedulers_db.py:313
+#: neutron/db/agentschedulers_db.py:313
 #, python-format
 msgid "Fail scheduling network %s"
 msgstr "無法排程網路 %s"
 
-#: quantum/db/api.py:64
+#: neutron/db/api.py:64
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "資料庫登錄異常狀況：%s"
 
-#: quantum/db/api.py:75
+#: neutron/db/api.py:75
 msgid "Database exception"
 msgstr ""
 
-#: quantum/db/db_base_plugin_v2.py:126
+#: neutron/db/db_base_plugin_v2.py:126
 msgid "Cannot create resource for another tenant"
 msgstr "無法給另一個 Tenant 建立資源"
 
-#: quantum/db/db_base_plugin_v2.py:274
+#: neutron/db/db_base_plugin_v2.py:274
 #, python-format
 msgid "Generated mac for network %(network_id)s is %(mac_address)s"
 msgstr "給網路 %(network_id)s 產生的 MAC 位址是 %(mac_address)s"
 
-#: quantum/db/db_base_plugin_v2.py:280
+#: neutron/db/db_base_plugin_v2.py:280
 #, python-format
 msgid "Generated mac %(mac_address)s exists. Remaining attempts %(max_retries)s."
 msgstr "產生的 MAC 位址 %(mac_address)s 已存在。還可以嘗試 %(max_retries)s 次。"
 
-#: quantum/db/db_base_plugin_v2.py:284
+#: neutron/db/db_base_plugin_v2.py:284
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr "嘗試 %s 次之後仍無法產生 MAC 位址"
 
-#: quantum/db/db_base_plugin_v2.py:314
+#: neutron/db/db_base_plugin_v2.py:314
 #, python-format
 msgid ""
 "Hold allocated IP %(ip_address)s "
 "(%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr "保留所配置的 IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:365
+#: neutron/db/db_base_plugin_v2.py:365
 #, python-format
 msgid "No allocation pool found for ip address:%s"
 msgstr "找不到 IP 位址的配置儲存區：%s"
 
-#: quantum/db/db_base_plugin_v2.py:378
+#: neutron/db/db_base_plugin_v2.py:378
 #, python-format
 msgid "Recycle %s"
 msgstr "回收 %s"
 
-#: quantum/db/db_base_plugin_v2.py:382
+#: neutron/db/db_base_plugin_v2.py:382
 #, python-format
 msgid "Recycle: first match for %(first_ip)s-%(last_ip)s"
 msgstr "回收：%(first_ip)s-%(last_ip)s 的第一個相符項"
 
-#: quantum/db/db_base_plugin_v2.py:389
+#: neutron/db/db_base_plugin_v2.py:389
 #, python-format
 msgid "Recycle: last match for %(first_ip)s-%(last_ip)s"
 msgstr "回收：%(first_ip)s-%(last_ip)s 的最後一個相符項"
 
-#: quantum/db/db_base_plugin_v2.py:401
+#: neutron/db/db_base_plugin_v2.py:401
 #, python-format
 msgid "Recycle: merged %(first_ip1)s-%(last_ip1)s and %(first_ip2)s-%(last_ip2)s"
 msgstr "回收：已合併 %(first_ip1)s-%(last_ip1)s 及 %(first_ip2)s-%(last_ip2)s"
 
-#: quantum/db/db_base_plugin_v2.py:410
+#: neutron/db/db_base_plugin_v2.py:410
 #, python-format
 msgid "Recycle: updated first %(first_ip)s-%(last_ip)s"
 msgstr "回收：已更新第一個 %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:415
+#: neutron/db/db_base_plugin_v2.py:415
 #, python-format
 msgid "Recycle: updated last %(first_ip)s-%(last_ip)s"
 msgstr "回收：已更新最後一個 %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:424
+#: neutron/db/db_base_plugin_v2.py:424
 #, python-format
 msgid "Recycle: created new %(first_ip)s-%(last_ip)s"
 msgstr "回收：已建立新的 %(first_ip)s-%(last_ip)s"
 
-#: quantum/db/db_base_plugin_v2.py:448
+#: neutron/db/db_base_plugin_v2.py:448
 #, python-format
 msgid ""
 "No fixed IP found that matches the network %(network_id)s and ip address "
 "%(ip_address)s."
 msgstr "找不到與網路 %(network_id)s 及 IP 位址 %(ip_address)s 相符的固定 IP。"
 
-#: quantum/db/db_base_plugin_v2.py:457
+#: neutron/db/db_base_plugin_v2.py:457
 #, python-format
 msgid "Delete allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 msgstr "刪除所配置的 IP %(ip_address)s (%(network_id)s/%(subnet_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:481
+#: neutron/db/db_base_plugin_v2.py:481
 #, python-format
 msgid "All IP's from subnet %(subnet_id)s (%(cidr)s) allocated"
 msgstr "子網路 %(subnet_id)s (%(cidr)s) 的所有 IP 都已配置"
 
-#: quantum/db/db_base_plugin_v2.py:486
+#: neutron/db/db_base_plugin_v2.py:486
 #, python-format
 msgid "Allocated IP - %(ip_address)s from %(first_ip)s to %(last_ip)s"
 msgstr "已配置 IP - %(ip_address)s（從 %(first_ip)s 到 %(last_ip)s）"
 
-#: quantum/db/db_base_plugin_v2.py:493
+#: neutron/db/db_base_plugin_v2.py:493
 msgid "No more free IP's in slice. Deleting allocation pool."
 msgstr "截塊中沒有更多的可用 IP。正在刪除配置儲存區。"
 
-#: quantum/db/db_base_plugin_v2.py:600
+#: neutron/db/db_base_plugin_v2.py:600
 msgid "IP allocation requires subnet_id or ip_address"
 msgstr "IP 配置需要 subnet_id 或 ip_address"
 
-#: quantum/db/db_base_plugin_v2.py:612
+#: neutron/db/db_base_plugin_v2.py:612
 #, python-format
 msgid "IP address %s is not a valid IP for the defined networks subnets"
 msgstr "IP 位址 %s 不是所定義網路子網路的有效 IP"
 
-#: quantum/db/db_base_plugin_v2.py:618
+#: neutron/db/db_base_plugin_v2.py:618
 #, python-format
 msgid ""
 "Failed to create port on network %(network_id)s, because fixed_ips "
 "included invalid subnet %(subnet_id)s"
 msgstr "無法在網路 %(network_id)s 上建立埠，因為 fixed_ips 包含無效的子網路 %(subnet_id)s"
 
-#: quantum/db/db_base_plugin_v2.py:638
+#: neutron/db/db_base_plugin_v2.py:638
 #, python-format
 msgid "IP address %s is not a valid IP for the defined subnet"
 msgstr "IP 位址 %s 不是所定義子網路的有效 IP"
 
-#: quantum/db/db_base_plugin_v2.py:647 quantum/db/db_base_plugin_v2.py:680
+#: neutron/db/db_base_plugin_v2.py:647 neutron/db/db_base_plugin_v2.py:680
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr "已超出每個埠的固定 IP 數目上限"
 
-#: quantum/db/db_base_plugin_v2.py:695
+#: neutron/db/db_base_plugin_v2.py:695
 #, python-format
 msgid "Port update. Hold %s"
 msgstr "埠更新。保留 %s"
 
-#: quantum/db/db_base_plugin_v2.py:703
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Port update. Adding %s"
 msgstr "埠更新。正在新增 %s"
 
-#: quantum/db/db_base_plugin_v2.py:758
+#: neutron/db/db_base_plugin_v2.py:758
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr "所要求的網路 %(network_id)s 子網路 (CIDR %(cidr)s) 與另一個子網路重疊"
 
-#: quantum/db/db_base_plugin_v2.py:763
+#: neutron/db/db_base_plugin_v2.py:763
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr "驗證 CIDR %(new_cidr)s 失敗 - 與子網路 %(subnet_id)s (CIDR %(cidr)s) 重疊"
 
-#: quantum/db/db_base_plugin_v2.py:783
+#: neutron/db/db_base_plugin_v2.py:783
 msgid "Performing IP validity checks on allocation pools"
 msgstr "正在對配置儲存區執行 IP 驗證檢查"
 
-#: quantum/db/db_base_plugin_v2.py:790
+#: neutron/db/db_base_plugin_v2.py:790
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "在儲存區中發現無效的 IP 位址：%(start)s - %(end)s："
 
-#: quantum/db/db_base_plugin_v2.py:797
+#: neutron/db/db_base_plugin_v2.py:797
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr "指定的 IP 位址與子網路 IP 版本不符"
 
-#: quantum/db/db_base_plugin_v2.py:801
+#: neutron/db/db_base_plugin_v2.py:801
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "起始 IP (%(start)s) 大於結尾 IP (%(end)s)"
 
-#: quantum/db/db_base_plugin_v2.py:806
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "找到的儲存區大於子網路 CIDR：%(start)s - %(end)s"
 
-#: quantum/db/db_base_plugin_v2.py:819
+#: neutron/db/db_base_plugin_v2.py:819
 msgid "Checking for overlaps among allocation pools and gateway ip"
 msgstr "正在檢查配置儲存區及閘道 IP 之間是否有重疊"
 
-#: quantum/db/db_base_plugin_v2.py:830
+#: neutron/db/db_base_plugin_v2.py:830
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "發現重疊的範圍：%(l_range)s 及 %(r_range)s"
 
-#: quantum/db/db_base_plugin_v2.py:843 quantum/db/db_base_plugin_v2.py:847
+#: neutron/db/db_base_plugin_v2.py:843 neutron/db/db_base_plugin_v2.py:847
 #, python-format
 msgid "Invalid route: %s"
 msgstr "無效的路徑：%s"
 
-#: quantum/db/db_base_plugin_v2.py:969
+#: neutron/db/db_base_plugin_v2.py:969
 #, python-format
 msgid "An exception occured while creating the %(resource)s:%(item)s"
 msgstr "建立 %(resource)s:%(item)s 時發生異常狀況"
 
-#: quantum/db/db_base_plugin_v2.py:1068
+#: neutron/db/db_base_plugin_v2.py:1068
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr "%(name)s '%(addr)s' 與 ip_version '%(ip_version)s' 不符"
 
-#: quantum/db/db_base_plugin_v2.py:1092
+#: neutron/db/db_base_plugin_v2.py:1092
 msgid "Gateway is not valid on subnet"
 msgstr "閘道在子網路上無效"
 
-#: quantum/db/db_base_plugin_v2.py:1105
+#: neutron/db/db_base_plugin_v2.py:1105
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr "剖析 DNS 位址 %s 時發生錯誤"
 
-#: quantum/db/db_base_plugin_v2.py:1367
+#: neutron/db/db_base_plugin_v2.py:1367
 #, python-format
 msgid "Allocated IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 msgstr "已配置 IP %(ip_address)s (%(network_id)s/%(subnet_id)s/%(port_id)s)"
 
-#: quantum/db/db_base_plugin_v2.py:1447
+#: neutron/db/db_base_plugin_v2.py:1447
 #, python-format
 msgid "%(address)s (%(subnet_id)s) is not recycled"
 msgstr "%(address)s (%(subnet_id)s) 未回收"
 
-#: quantum/db/dhcp_rpc_base.py:35
+#: neutron/db/dhcp_rpc_base.py:35
 #, python-format
 msgid "Network list requested from %s"
 msgstr "從 %s 要求的網路清單"
 
-#: quantum/db/dhcp_rpc_base.py:52
+#: neutron/db/dhcp_rpc_base.py:52
 #, python-format
 msgid "Network %(network_id)s requested from %(host)s"
 msgstr "從 %(host)s 要求的網路 %(network_id)s"
 
-#: quantum/db/dhcp_rpc_base.py:77
+#: neutron/db/dhcp_rpc_base.py:77
 #, python-format
 msgid "Port %(device_id)s for %(network_id)s requested from %(host)s"
 msgstr "從 %(host)s 要求的 %(network_id)s 埠 %(device_id)s"
 
-#: quantum/db/dhcp_rpc_base.py:111
+#: neutron/db/dhcp_rpc_base.py:111
 #, python-format
 msgid ""
 "DHCP port %(device_id)s on network %(network_id)s does not exist on "
 "%(host)s"
 msgstr "網路 %(network_id)s 上的 DHCP 埠 %(device_id)s 不存在於 %(host)s 上"
 
-#: quantum/db/dhcp_rpc_base.py:144
+#: neutron/db/dhcp_rpc_base.py:144
 #, python-format
 msgid "DHCP port deletion for %(network_id)s request from %(host)s"
 msgstr "%(host)s 提出 %(network_id)s 要求來刪除 DHCP 埠"
 
-#: quantum/db/dhcp_rpc_base.py:161
+#: neutron/db/dhcp_rpc_base.py:161
 #, python-format
 msgid "DHCP port remove fixed_ip for %(subnet_id)s request from %(host)s"
 msgstr "%(host)s 提出 %(subnet_id)s 要求來移除 DHCP 埠 fixed_ip"
 
-#: quantum/db/dhcp_rpc_base.py:185
+#: neutron/db/dhcp_rpc_base.py:185
 #, python-format
 msgid ""
 "Updating lease expiration for %(ip_address)s on network %(network_id)s "
 "from %(host)s."
 msgstr "正在從 %(host)s 更新網路 %(network_id)s 上 %(ip_address)s 的租賃有效期限。"
 
-#: quantum/db/extraroute_db.py:38
+#: neutron/db/extraroute_db.py:38
 msgid "Maximum number of routes"
 msgstr "路徑數目上限"
 
-#: quantum/db/extraroute_db.py:100
+#: neutron/db/extraroute_db.py:100
 msgid "the nexthop is not connected with router"
 msgstr "下一個中繼站未與路由器連接"
 
-#: quantum/db/extraroute_db.py:107
+#: neutron/db/extraroute_db.py:107
 msgid "the nexthop is used by router"
 msgstr "路由器已使用下一個中繼站"
 
-#: quantum/db/l3_db.py:206
+#: neutron/db/l3_db.py:206
 #, python-format
 msgid "No IPs available for external network %s"
 msgstr "外部網路 %s 沒有可用的 IP"
 
-#: quantum/db/l3_db.py:226 quantum/db/l3_db.py:639
+#: neutron/db/l3_db.py:226 neutron/db/l3_db.py:639
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr "網路 %s 不是有效的外部網路"
 
-#: quantum/db/l3_db.py:312
+#: neutron/db/l3_db.py:312
 #, python-format
 msgid "Router already has a port on subnet %s"
 msgstr "路由器在子網路 %s 上已經有埠"
 
-#: quantum/db/l3_db.py:326
+#: neutron/db/l3_db.py:326
 #, python-format
 msgid ""
 "Cidr %(subnet_cidr)s of subnet %(subnet_id)s overlaps with cidr %(cidr)s "
@@ -2188,80 +2201,80 @@ msgstr ""
 "子網路 %(subnet_id)s 的 CIDR %(subnet_cidr)s 與子網路 %(sub_id)s 的 CIDR %(cidr)s "
 "重疊"
 
-#: quantum/db/l3_db.py:335 quantum/db/l3_db.py:412
+#: neutron/db/l3_db.py:335 neutron/db/l3_db.py:412
 msgid "Either subnet_id or port_id must be specified"
 msgstr "必須指定 subnet_id 或 port_id"
 
-#: quantum/db/l3_db.py:340
+#: neutron/db/l3_db.py:340
 msgid "Cannot specify both subnet-id and port-id"
 msgstr "無法同時指定 subnet-id 及 port-id"
 
-#: quantum/db/l3_db.py:350
+#: neutron/db/l3_db.py:350
 msgid "Router port must have exactly one fixed IP"
 msgstr "路由器埠必須正好只有一個固定 IP"
 
-#: quantum/db/l3_db.py:365
+#: neutron/db/l3_db.py:365
 msgid "Subnet for router interface must have a gateway IP"
 msgstr "路由器介面的子網路必須具有閘道 IP"
 
-#: quantum/db/l3_db.py:499
+#: neutron/db/l3_db.py:499
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr "無法將浮動 IP 新增至子網路 %s 上沒有 gateway_ip 的埠"
 
-#: quantum/db/l3_db.py:538
+#: neutron/db/l3_db.py:538
 #, python-format
 msgid ""
 "Port %(port_id)s is associated with a different tenant than Floating IP "
 "%(floatingip_id)s and therefore cannot be bound."
 msgstr "埠 %(port_id)s 已與浮動 IP %(floatingip_id)s 之外的 Tenant 產生關聯，因此無法連結。"
 
-#: quantum/db/l3_db.py:542
+#: neutron/db/l3_db.py:542
 #, python-format
 msgid ""
 "Cannnot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: quantum/db/l3_db.py:554
+#: neutron/db/l3_db.py:554
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr "埠 %(id)s 沒有固定 IP %(address)s"
 
-#: quantum/db/l3_db.py:561
+#: neutron/db/l3_db.py:561
 #, python-format
 msgid "Cannot add floating IP to port %s that hasno fixed IP addresses"
 msgstr "無法將浮動 IP 新增至沒有固定 IP 位址的埠 %s"
 
-#: quantum/db/l3_db.py:565
+#: neutron/db/l3_db.py:565
 #, python-format
 msgid ""
 "Port %s has multiple fixed IPs.  Must provide a specific IP when "
 "assigning a floating IP"
 msgstr "埠 %s 具有多個固定 IP。指派浮動 IP 時必須提供特定 IP"
 
-#: quantum/db/l3_db.py:607 quantum/plugins/nicira/QuantumPlugin.py:1792
+#: neutron/db/l3_db.py:607 neutron/plugins/nicira/NeutronPlugin.py:1793
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr "如果未指定 port_id，則無法指定 fixed_ip_address"
 
-#: quantum/db/l3_db.py:764
+#: neutron/db/l3_db.py:764
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(port_owner)s, but no IP address, so it can "
 "be deleted"
 msgstr "埠 %(port_id)s 具有擁有者 %(port_owner)s，但沒有 IP 位址，因此可以刪除"
 
-#: quantum/db/l3_db.py:782
+#: neutron/db/l3_db.py:782
 #, python-format
 msgid "Multiple floating IPs found for port %s"
 msgstr "找到埠 %s 的多個浮動 IP"
 
-#: quantum/db/l3_db.py:938
+#: neutron/db/l3_db.py:938
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr "正在跳過埠 %s，因為其上沒有配置 IP"
 
-#: quantum/db/l3_rpc_base.py:52
+#: neutron/db/l3_rpc_base.py:52
 #, python-format
 msgid ""
 "Routers returned to l3 agent:\n"
@@ -2270,290 +2283,290 @@ msgstr ""
 "路由器已傳回至 L3 代理程式：\n"
 "%s"
 
-#: quantum/db/l3_rpc_base.py:65
+#: neutron/db/l3_rpc_base.py:65
 #, python-format
 msgid "External network ID returned to l3 agent: %s"
 msgstr "外部網路 ID 已傳回至 L3 代理程式：%s"
 
-#: quantum/db/routedserviceinsertion_db.py:38
+#: neutron/db/routedserviceinsertion_db.py:38
 #, python-format
 msgid "Resource type '%(resource_type)s' is longer than %(maxlen)d characters"
 msgstr "資源類型 '%(resource_type)s' 的長度超過 %(maxlen)d 個字元"
 
-#: quantum/db/servicetype_db.py:40
+#: neutron/db/servicetype_db.py:40
 msgid "Textual description for the default service type"
 msgstr "預設服務類型的文字說明"
 
-#: quantum/db/servicetype_db.py:42
+#: neutron/db/servicetype_db.py:42
 msgid ""
 "Defines a provider for an advanced service using the format: "
 "<service>:<plugin>[:<driver>]"
 msgstr "使用下列格式來定義進階服務的提供者：<service>:<plugin>[:<driver>]"
 
-#: quantum/db/servicetype_db.py:62
+#: neutron/db/servicetype_db.py:62
 #, python-format
 msgid ""
 "Default service type - no driver for service %(service_class)s and plugin"
 " %(plugin)s"
 msgstr "預設服務類型 - 服務 %(service_class)s 及外掛程式 %(plugin)s 沒有驅動程式"
 
-#: quantum/db/servicetype_db.py:73
+#: neutron/db/servicetype_db.py:73
 msgid ""
 "No default service definition in configuration file. Please add service "
 "definitions using the service_definition variable in the "
 "[default_servicetype] section"
 msgstr ""
 
-#: quantum/db/servicetype_db.py:79
+#: neutron/db/servicetype_db.py:79
 #, python-format
 msgid "Service type %(service_type_id)s could not be found "
 msgstr "找不到服務類型 %(service_type_id)s"
 
-#: quantum/db/servicetype_db.py:83
+#: neutron/db/servicetype_db.py:83
 #, python-format
 msgid ""
 "There are still active instances of service type '%(service_type_id)s'. "
 "Therefore it cannot be removed."
 msgstr "服務類型 '%(service_type_id)s' 仍有作用中的實例。因此無法移除。"
 
-#: quantum/db/servicetype_db.py:150
+#: neutron/db/servicetype_db.py:150
 #, python-format
 msgid ""
-"Default service type record updated in Quantum database. identifier is "
+"Default service type record updated in Neutron database. identifier is "
 "'%s'"
-msgstr "在 Quantum 資料庫中更新了預設服務類型記錄。ID 為 '%s'"
+msgstr ""
 
-#: quantum/db/servicetype_db.py:218
+#: neutron/db/servicetype_db.py:218
 #, python-format
 msgid "Multiple default service type instances found.Will use instance '%s'"
 msgstr "找到多個預設服務類型實例。將使用實例 '%s'"
 
-#: quantum/db/servicetype_db.py:264
+#: neutron/db/servicetype_db.py:264
 #, python-format
 msgid "Created service type object:%s"
 msgstr "已建立服務類型物件：%s"
 
-#: quantum/db/servicetype_db.py:311
+#: neutron/db/servicetype_db.py:311
 #, python-format
 msgid "Number of instances for service type '%s' is already 0."
 msgstr "服務類型 '%s' 的實例數已經是 0。"
 
-#: quantum/db/sqlalchemyutils.py:74
+#: neutron/db/sqlalchemyutils.py:74
 #, python-format
 msgid "%s is invalid attribute for sort_key"
 msgstr "對於 sort_key 來說，%s 是無效的屬性"
 
-#: quantum/db/sqlalchemyutils.py:77
+#: neutron/db/sqlalchemyutils.py:77
 #, python-format
 msgid ""
 "The attribute '%(attr)s' is reference to other resource, can't used by "
 "sort '%(resource)s'"
 msgstr "屬性 '%(attr)s' 是對其他資源的參照，無法由排序 '%(resource)s' 使用"
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:68
+#: neutron/db/loadbalancer/loadbalancer_db.py:68
 #, python-format
 msgid "The %(key)s field can not have negative value. Current value is %(value)d."
 msgstr ""
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:243
+#: neutron/db/loadbalancer/loadbalancer_db.py:243
 msgid "'cookie_name' should be specified for this type of session persistence."
 msgstr "應該給這種類型的階段作業持續性指定 'cookie_name'。"
 
-#: quantum/db/loadbalancer/loadbalancer_db.py:247
+#: neutron/db/loadbalancer/loadbalancer_db.py:247
 msgid "'cookie_name' is not allowed for this type of session persistence"
 msgstr "這種類型的階段作業持續性不接受 'cookie_name'"
 
-#: quantum/db/migration/cli.py:30
-msgid "Quantum plugin provider module"
-msgstr "Quantum 外掛程式提供者模組"
+#: neutron/db/migration/cli.py:32
+msgid "Neutron plugin provider module"
+msgstr ""
 
-#: quantum/db/migration/cli.py:36
-msgid "Quantum quota driver class"
-msgstr "Quantum 配額驅動程式類別"
+#: neutron/db/migration/cli.py:38
+msgid "Neutron quota driver class"
+msgstr ""
 
-#: quantum/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:45
 msgid "URL to database"
 msgstr "資料庫 URL"
 
-#: quantum/db/migration/cli.py:65
+#: neutron/db/migration/cli.py:67
 msgid "You must provide a revision or relative delta"
 msgstr "必須提供修訂或相對差異"
 
-#: quantum/db/migration/cli.py:120
+#: neutron/db/migration/cli.py:122
 msgid "Available commands"
 msgstr "可用的指令"
 
-#: quantum/debug/commands.py:34
+#: neutron/debug/commands.py:34
 msgid "Unimplemented commands"
 msgstr "未實作的指令"
 
-#: quantum/debug/commands.py:46
+#: neutron/debug/commands.py:46
 msgid "ID of network to probe"
 msgstr "要探測的網路 ID"
 
-#: quantum/debug/commands.py:50
+#: neutron/debug/commands.py:50
 msgid "owner type of the device: network/compute"
 msgstr "裝置的擁有者類型：網路/計算"
 
-#: quantum/debug/commands.py:58
+#: neutron/debug/commands.py:58
 #, python-format
 msgid "Probe created : %s "
 msgstr "已建立探針：%s "
 
-#: quantum/debug/commands.py:70
+#: neutron/debug/commands.py:70
 msgid "ID of probe port to delete"
 msgstr "要刪除的探針埠 ID"
 
-#: quantum/debug/commands.py:77
+#: neutron/debug/commands.py:77
 #, python-format
 msgid "Probe %s deleted"
 msgstr "已刪除探針 %s"
 
-#: quantum/debug/commands.py:108
+#: neutron/debug/commands.py:108
 msgid "All Probes deleted "
 msgstr "已刪除所有探針"
 
-#: quantum/debug/commands.py:120
+#: neutron/debug/commands.py:120
 msgid "ID of probe port to execute command"
 msgstr "要執行指令的探針埠 ID"
 
-#: quantum/debug/commands.py:125
+#: neutron/debug/commands.py:125
 msgid "Command to execute"
 msgstr "要執行的指令"
 
-#: quantum/debug/commands.py:145
+#: neutron/debug/commands.py:145
 msgid "Ping timeout"
 msgstr "連通測試逾時值"
 
-#: quantum/debug/commands.py:149
+#: neutron/debug/commands.py:149
 msgid "ID of network"
 msgstr "網路的 ID"
 
-#: quantum/debug/debug_agent.py:43
+#: neutron/debug/debug_agent.py:43
 msgid "Use Linux network namespaces"
 msgstr "使用 Linux 網路名稱空間"
 
-#: quantum/debug/debug_agent.py:128
+#: neutron/debug/debug_agent.py:128
 #, python-format
 msgid "Failed to delete namespace %s"
 msgstr "無法刪除名稱空間 %s"
 
-#: quantum/debug/shell.py:60
+#: neutron/debug/shell.py:64
 msgid "Config file for interface driver (You may also use l3_agent.ini)"
 msgstr "介面驅動程式的配置檔（您也可使用 l3_agent.ini）"
 
-#: quantum/debug/shell.py:68
+#: neutron/debug/shell.py:72
 msgid ""
 "You must provide a config file for bridge - either --config-file or "
-"env[QUANTUM_TEST_CONFIG_FILE]"
-msgstr "必須為橋接器提供配置檔：--config-file，或 env[QUANTUM_TEST_CONFIG_FILE]"
+"env[NEUTRON_TEST_CONFIG_FILE]"
+msgstr ""
 
-#: quantum/extensions/agent.py:61
+#: neutron/extensions/agent.py:61
 #, python-format
 msgid "Agent %(id)s could not be found"
 msgstr "找不到代理程式 %(id)s"
 
-#: quantum/extensions/agent.py:65
+#: neutron/extensions/agent.py:65
 #, python-format
 msgid "Agent with agent_type=%(agent_type)s and host=%(host)s could not be found"
 msgstr "找不到 agent_type = %(agent_type)s 且主機 = %(host)s 的代理程式"
 
-#: quantum/extensions/agent.py:70
+#: neutron/extensions/agent.py:70
 #, python-format
 msgid "Multiple agents with agent_type=%(agent_type)s and host=%(host)s found"
 msgstr "找到多個 agent_type = %(agent_type)s 且主機 = %(host)s 的代理程式"
 
-#: quantum/extensions/agentscheduler.py:176
+#: neutron/extensions/agentscheduler.py:176
 #, python-format
 msgid "Agent %(id)s is not a valid DHCP Agent or has been disabled"
 msgstr "代理程式 %(id)s 不是有效的 DHCP 代理程式或者已停用"
 
-#: quantum/extensions/agentscheduler.py:180
+#: neutron/extensions/agentscheduler.py:180
 #, python-format
 msgid ""
 "The network %(network_id)s has been already hosted by the DHCP Agent "
 "%(agent_id)s."
 msgstr "網路 %(network_id)s 已經由 DHCP 代理程式 %(agent_id)s 管理。"
 
-#: quantum/extensions/agentscheduler.py:185
+#: neutron/extensions/agentscheduler.py:185
 #, python-format
 msgid "The network %(network_id)s is not hosted by the DHCP agent %(agent_id)s."
 msgstr "網路 %(network_id)s 不是由 DHCP 代理程式 %(agent_id)s 管理。"
 
-#: quantum/extensions/agentscheduler.py:190
+#: neutron/extensions/agentscheduler.py:190
 #, python-format
 msgid "Agent %(id)s is not a L3 Agent or has been disabled"
 msgstr "代理程式 %(id)s 不是 L3 代理程式或者已停用"
 
-#: quantum/extensions/agentscheduler.py:194
+#: neutron/extensions/agentscheduler.py:194
 #, python-format
 msgid ""
 "The router %(router_id)s has been already hosted by the L3 Agent "
 "%(agent_id)s."
 msgstr "路由器 %(router_id)s 已經由 L3 代理程式 %(agent_id)s 管理。"
 
-#: quantum/extensions/agentscheduler.py:199
+#: neutron/extensions/agentscheduler.py:199
 #, python-format
 msgid "Failed scheduling router %(router_id)s to the L3 Agent %(agent_id)s."
 msgstr "無法將路由器 %(router_id)s 排程到 L3 代理程式 %(agent_id)s。"
 
-#: quantum/extensions/agentscheduler.py:204
+#: neutron/extensions/agentscheduler.py:204
 #, python-format
 msgid "The router %(router_id)s is not hosted by L3 agent %(agent_id)s."
 msgstr "路由器 %(router_id)s 不是由 L3 代理程式 %(agent_id)s 管理。"
 
-#: quantum/extensions/extraroute.py:25
+#: neutron/extensions/extraroute.py:25
 #, python-format
 msgid "Invalid format for routes: %(routes)s, %(reason)s"
 msgstr "無效的路徑格式：%(routes)s，%(reason)s"
 
-#: quantum/extensions/extraroute.py:29
+#: neutron/extensions/extraroute.py:29
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more routes."
 msgstr "路由器 %(router_id)s 上子網路 %(subnet_id)s 的路由器介面無法刪除，因為一個以上的路徑需要該介面。"
 
-#: quantum/extensions/extraroute.py:35
+#: neutron/extensions/extraroute.py:35
 #, python-format
 msgid ""
 "Unable to complete operation for %(router_id)s. The number of routes "
 "exceeds the maximum %(quota)s."
 msgstr "無法對 %(router_id)s 完成作業。路徑數目超出上限 %(quota)s。"
 
-#: quantum/extensions/l3.py:35
+#: neutron/extensions/l3.py:35
 #, python-format
 msgid "Router %(router_id)s could not be found"
 msgstr "找不到路由器 %(router_id)s"
 
-#: quantum/extensions/l3.py:39
+#: neutron/extensions/l3.py:39
 #, python-format
 msgid "Router %(router_id)s still has active ports"
 msgstr "路由器 %(router_id)s 仍具有作用中的埠"
 
-#: quantum/extensions/l3.py:43
+#: neutron/extensions/l3.py:43
 #, python-format
 msgid "Router %(router_id)s does not have an interface with id %(port_id)s"
 msgstr "路由器 %(router_id)s 沒有 ID 為 %(port_id)s 的介面"
 
-#: quantum/extensions/l3.py:48
+#: neutron/extensions/l3.py:48
 #, python-format
 msgid "Router %(router_id)s has no interface on subnet %(subnet_id)s"
 msgstr "路由器 %(router_id)s 在子網路 %(subnet_id)s 上沒有介面"
 
-#: quantum/extensions/l3.py:53
+#: neutron/extensions/l3.py:53
 #, python-format
 msgid ""
 "Router interface for subnet %(subnet_id)s on router %(router_id)s cannot "
 "be deleted, as it is required by one or more floating IPs."
 msgstr "路由器 %(router_id)s 上子網路 %(subnet_id)s 的路由器介面無法刪除，因為一個以上的浮動 IP 需要該介面。"
 
-#: quantum/extensions/l3.py:59
+#: neutron/extensions/l3.py:59
 #, python-format
 msgid "Floating IP %(floatingip_id)s could not be found"
 msgstr "找不到浮動 IP %(floatingip_id)s"
 
-#: quantum/extensions/l3.py:63
+#: neutron/extensions/l3.py:63
 #, python-format
 msgid ""
 "External network %(external_network_id)s is not reachable from subnet "
@@ -2563,7 +2576,7 @@ msgstr ""
 "無法從子網路 %(subnet_id)s 抵達外部網路 %(external_network_id)s。因此，無法使埠 %(port_id)s "
 "與浮動 IP 產生關聯。"
 
-#: quantum/extensions/l3.py:69
+#: neutron/extensions/l3.py:69
 #, python-format
 msgid ""
 "Cannot associate floating IP %(floating_ip_address)s (%(fip_id)s) with "
@@ -2573,142 +2586,142 @@ msgstr ""
 "無法使浮動 IP %(floating_ip_address)s (%(fip_id)s) 與使用固定 IP %(fixed_ip)s 的埠 "
 "%(port_id)s 產生關聯，因為該固定 IP 在外部網路 %(net_id)s 上已經有浮動 IP。"
 
-#: quantum/extensions/l3.py:76
+#: neutron/extensions/l3.py:76
 #, python-format
 msgid ""
 "Port %(port_id)s has owner %(device_owner)s and therefore cannot be "
 "deleted directly via the port API."
 msgstr "埠 %(port_id)s 具有擁有者 %(device_owner)s，因此無法直接透過埠 API 來刪除。"
 
-#: quantum/extensions/l3.py:81
+#: neutron/extensions/l3.py:81
 #, python-format
 msgid ""
 "External network %(net_id)s cannot be updated to be made non-external, "
 "since it has existing gateway ports"
 msgstr "無法將外部網路 %(net_id)s 更新成非外部網路，因為它具有現存的閘道埠"
 
-#: quantum/extensions/l3.py:86
+#: neutron/extensions/l3.py:86
 #, python-format
 msgid ""
 "Gateway cannot be updated for router %(router_id)s, since a gateway to "
 "external network %(net_id)s is required by one or more floating IPs."
 msgstr "無法更新路由器 %(router_id)s 的閘道，因為一個以上的浮動 IP 需要外部網路 %(net_id)s 的閘道。"
 
-#: quantum/extensions/l3.py:156
+#: neutron/extensions/l3.py:156
 msgid "Number of routers allowed per tenant, -1 for unlimited"
 msgstr "每個 Tenant 所容許的路由器數目，-1 表示無限制"
 
-#: quantum/extensions/l3.py:160
+#: neutron/extensions/l3.py:160
 msgid "Number of floating IPs allowed per tenant, -1 for unlimited"
 msgstr "每個 Tenant 所容許的浮動 IP 數目，-1 表示無限制"
 
-#: quantum/extensions/l3_ext_gw_mode.py:27
+#: neutron/extensions/l3_ext_gw_mode.py:27
 #, python-format
 msgid ""
 "DNat is disabled for the router %(router_id)s. Floating IPs cannot be "
 "associated."
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancer.py:33
 #, python-format
 msgid "Vip %(vip_id)s could not be found"
 msgstr "找不到 VIP %(vip_id)s"
 
-#: quantum/extensions/loadbalancer.py:37
+#: neutron/extensions/loadbalancer.py:37
 #, python-format
 msgid "Another Vip already exists for pool %(pool_id)s"
 msgstr ""
 
-#: quantum/extensions/loadbalancer.py:41
+#: neutron/extensions/loadbalancer.py:41
 #, python-format
 msgid "Pool %(pool_id)s could not be found"
 msgstr "找不到儲存區 %(pool_id)s"
 
-#: quantum/extensions/loadbalancer.py:45
+#: neutron/extensions/loadbalancer.py:45
 #, python-format
 msgid "Member %(member_id)s could not be found"
 msgstr "找不到成員 %(member_id)s"
 
-#: quantum/extensions/loadbalancer.py:49
+#: neutron/extensions/loadbalancer.py:49
 #, python-format
 msgid "Health_monitor %(monitor_id)s could not be found"
 msgstr "找不到 Health_monitor %(monitor_id)s"
 
-#: quantum/extensions/loadbalancer.py:53
+#: neutron/extensions/loadbalancer.py:53
 #, python-format
 msgid "Invalid state %(state)s of Loadbalancer resource %(id)s"
 msgstr "負載平衡器資源 %(id)s 的狀態 %(state)s 無效"
 
-#: quantum/extensions/loadbalancer.py:57
+#: neutron/extensions/loadbalancer.py:57
 #, python-format
 msgid "Pool %(pool_id)s is still in use"
 msgstr "儲存區 %(pool_id)s 仍在使用中"
 
-#: quantum/extensions/loadbalancer.py:61
+#: neutron/extensions/loadbalancer.py:61
 #, python-format
 msgid "Statistics of Pool %(pool_id)s could not be found"
 msgstr "找不到儲存區 %(pool_id)s 的統計資料"
 
-#: quantum/extensions/loadbalancer.py:65
+#: neutron/extensions/loadbalancer.py:65
 #, python-format
 msgid "Protocol %(vip_proto)s does not match pool protocol %(pool_proto)s"
 msgstr "通訊協定 %(vip_proto)s 與儲存區通訊協定 %(pool_proto)s 不符"
 
-#: quantum/extensions/portsecurity.py:25
+#: neutron/extensions/portsecurity.py:25
 msgid ""
 "Port has security group associated. Cannot disable port security or ip "
 "address until security group is removed"
 msgstr "埠已與安全群組產生關聯。無法停用埠安全或 IP 位址，除非將安全群組移除"
 
-#: quantum/extensions/portsecurity.py:30
+#: neutron/extensions/portsecurity.py:30
 msgid ""
 "Port security must be enabled and port must have an IP address in order "
 "to use security groups."
 msgstr "埠安全必須加以啟用，而且埠必須具有 IP 位址，才能使用安全群組。"
 
-#: quantum/extensions/portsecurity.py:35
+#: neutron/extensions/portsecurity.py:35
 msgid "Port does not have port security binding."
 msgstr "埠沒有埠安全連結。"
 
-#: quantum/extensions/providernet.py:56
+#: neutron/extensions/providernet.py:56
 msgid "plugin does not support updating provider attributes"
 msgstr "外掛程式不支援更新提供者屬性"
 
-#: quantum/extensions/quotasv2.py:85
+#: neutron/extensions/quotasv2.py:87
 msgid "Non-admin is not authorised to access quotas for another tenant"
 msgstr "非管理者未獲授權來存取另一個 Tenant 的配額"
 
-#: quantum/extensions/quotasv2.py:90
+#: neutron/extensions/quotasv2.py:92
 msgid "Only admin can view or configure quota"
 msgstr "只有管理者才能檢視或配置配額"
 
-#: quantum/extensions/securitygroup.py:34
+#: neutron/extensions/securitygroup.py:34
 msgid "For TCP/UDP protocols, port_range_min must be <= port_range_max"
 msgstr "對於 TCP/UDP 通訊協定，port_range_min 必須 <= port_range_max"
 
-#: quantum/extensions/securitygroup.py:39
+#: neutron/extensions/securitygroup.py:39
 #, python-format
 msgid "Invalid value for port %(port)s"
 msgstr "埠 %(port)s 的值無效"
 
-#: quantum/extensions/securitygroup.py:43
+#: neutron/extensions/securitygroup.py:43
 #, python-format
 msgid "Security Group %(id)s in use."
 msgstr "安全群組 %(id)s 正在使用中。"
 
-#: quantum/extensions/securitygroup.py:47
+#: neutron/extensions/securitygroup.py:47
 msgid "Removing default security group not allowed."
 msgstr "不容許移除預設安全群組。"
 
-#: quantum/extensions/securitygroup.py:51
+#: neutron/extensions/securitygroup.py:51
 msgid "Updating default security group not allowed."
 msgstr ""
 
-#: quantum/extensions/securitygroup.py:55
+#: neutron/extensions/securitygroup.py:55
 msgid "Default security group already exists."
 msgstr "預設安全群組已存在。"
 
-#: quantum/extensions/securitygroup.py:59
+#: neutron/extensions/securitygroup.py:59
 #, fuzzy, python-format
 msgid ""
 "Security group rule protocol %(protocol)s not supported. Only protocol "
@@ -2716,391 +2729,391 @@ msgid ""
 "supported."
 msgstr "不支援安全群組規則通訊協定 %(protocol)s。僅支援通訊協定值 %(values)s。"
 
-#: quantum/extensions/securitygroup.py:65
+#: neutron/extensions/securitygroup.py:65
 msgid "Multiple tenant_ids in bulk security group rule create not allowed"
 msgstr "不容許主體安全群組規則建立作業中存在多個 tenant_id"
 
-#: quantum/extensions/securitygroup.py:70
+#: neutron/extensions/securitygroup.py:70
 msgid "Only remote_ip_prefix or remote_group_id may be provided."
 msgstr "只能提供 remote_ip_prefix 或 remote_group_id。"
 
-#: quantum/extensions/securitygroup.py:75
+#: neutron/extensions/securitygroup.py:75
 msgid "Must also specifiy protocol if port range is given."
 msgstr "如果給定埠範圍，則也必須指定通訊協定。"
 
-#: quantum/extensions/securitygroup.py:79
+#: neutron/extensions/securitygroup.py:79
 msgid "Only allowed to update rules for one security profile at a time"
 msgstr "一次只容許更新一個安全設定檔的規則"
 
-#: quantum/extensions/securitygroup.py:84
+#: neutron/extensions/securitygroup.py:84
 #, python-format
 msgid "Security group %(id)s does not exist"
 msgstr "安全群組 %(id)s 不存在"
 
-#: quantum/extensions/securitygroup.py:88
+#: neutron/extensions/securitygroup.py:88
 #, python-format
 msgid "Security group rule %(id)s does not exist"
 msgstr "安全群組規則 %(id)s 不存在"
 
-#: quantum/extensions/securitygroup.py:92
+#: neutron/extensions/securitygroup.py:92
 msgid "Duplicate Security Group Rule in POST."
 msgstr "POST 中的安全群組規則重複。"
 
-#: quantum/extensions/securitygroup.py:96
+#: neutron/extensions/securitygroup.py:96
 #, python-format
 msgid "Security group rule already exists. Group id is %(id)s."
 msgstr "安全群組規則已存在。群組 ID 為 %(id)s。"
 
-#: quantum/extensions/securitygroup.py:144
+#: neutron/extensions/securitygroup.py:144
 #, python-format
 msgid "'%s' is not an integer or uuid"
 msgstr "'%s' 不是整數或 UUID"
 
-#: quantum/extensions/securitygroup.py:221
+#: neutron/extensions/securitygroup.py:221
 msgid "Number of security groups allowed per tenant,-1 for unlimited"
 msgstr "每個 Tenant 所容許的安全群組數目，-1 表示無限制"
 
-#: quantum/extensions/securitygroup.py:225
+#: neutron/extensions/securitygroup.py:225
 msgid "Number of security rules allowed per tenant, -1 for unlimited"
 msgstr "每個 Tenant 所容許的安全規則數目，-1 表示無限制"
 
-#: quantum/extensions/servicetype.py:82
+#: neutron/extensions/servicetype.py:82
 #, python-format
 msgid "The service type '%s' does not exist"
 msgstr "服務類型 '%s' 不存在"
 
-#: quantum/extensions/servicetype.py:89
+#: neutron/extensions/servicetype.py:89
 msgid ""
 "No service type definition was provided. At least a service type "
 "definition must be provided"
 msgstr "未提供服務類型定義。必須至少提供一個服務類型定義"
 
-#: quantum/extensions/servicetype.py:101
+#: neutron/extensions/servicetype.py:101
 #, python-format
 msgid "Required attributes missing in service definition: %s"
 msgstr "服務定義中遺漏了必要屬性：%s"
 
-#: quantum/extensions/servicetype.py:103 quantum/extensions/servicetype.py:110
-#: quantum/extensions/servicetype.py:117 quantum/extensions/servicetype.py:126
-#: quantum/extensions/servicetype.py:131 quantum/extensions/servicetype.py:148
-#: quantum/extensions/servicetype.py:156
+#: neutron/extensions/servicetype.py:103 neutron/extensions/servicetype.py:110
+#: neutron/extensions/servicetype.py:117 neutron/extensions/servicetype.py:126
+#: neutron/extensions/servicetype.py:131 neutron/extensions/servicetype.py:148
+#: neutron/extensions/servicetype.py:156
 #, python-format
 msgid "%(f_name)s: %(msg)s"
 msgstr "%(f_name)s：%(msg)s"
 
-#: quantum/extensions/servicetype.py:108
+#: neutron/extensions/servicetype.py:108
 #, python-format
 msgid "Service name '%s' unspecified or invalid"
 msgstr "服務名稱 '%s' 未指定或無效"
 
-#: quantum/extensions/servicetype.py:115
+#: neutron/extensions/servicetype.py:115
 #, python-format
 msgid "Plugin name not specified in service definition %s"
 msgstr "服務定義 %s 中未指定外掛程式名稱"
 
-#: quantum/extensions/servicetype.py:125
+#: neutron/extensions/servicetype.py:125
 #, python-format
 msgid "No plugin for service '%s'"
 msgstr "服務 '%s' 沒有外掛程式"
 
-#: quantum/extensions/servicetype.py:130
+#: neutron/extensions/servicetype.py:130
 #, python-format
 msgid "Plugin name '%s' is not correct "
 msgstr "外掛程式名稱 '%s' 不正確"
 
-#: quantum/extensions/servicetype.py:146
+#: neutron/extensions/servicetype.py:146
 #, python-format
 msgid "Unparseable attributes found in service definition %s"
 msgstr "在服務定義 %s 中發現無法剖析的屬性"
 
-#: quantum/extensions/servicetype.py:152
+#: neutron/extensions/servicetype.py:152
 #, python-format
 msgid "Exception while parsing service definition:%s"
 msgstr "剖析服務定義時發生異常狀況：%s"
 
-#: quantum/extensions/servicetype.py:154
+#: neutron/extensions/servicetype.py:154
 #, python-format
 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:86
+#: neutron/extensions/servicetype.py:160
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:86
 #, python-format
 msgid "%s: provided data are not iterable"
 msgstr "%s：提供的資料無法反覆運算"
 
-#: quantum/extensions/servicetype.py:171
-msgid "Quantum Service Type Management"
-msgstr "Quantum 服務類型管理"
+#: neutron/extensions/servicetype.py:171
+msgid "Neutron Service Type Management"
+msgstr ""
 
-#: quantum/extensions/servicetype.py:179
+#: neutron/extensions/servicetype.py:179
 msgid ""
-"API for retrieving and managing service types for Quantum advanced "
+"API for retrieving and managing service types for Neutron advanced "
 "services"
-msgstr "用於擷取及管理 Quantum 進階服務之服務類型的 API"
+msgstr ""
 
-#: quantum/openstack/common/exception.py:104
+#: neutron/openstack/common/exception.py:104
 msgid "Uncaught exception"
 msgstr "未捕捉到的異常狀況"
 
-#: quantum/openstack/common/excutils.py:48
+#: neutron/openstack/common/excutils.py:48
 #, python-format
 msgid "Original exception being dropped: %s"
 msgstr "正在捨棄原始異常狀況：%s"
 
-#: quantum/openstack/common/lockutils.py:102
+#: neutron/openstack/common/lockutils.py:102
 #, python-format
 msgid "Could not release the acquired lock `%s`"
 msgstr "無法釋放獲得的鎖定 `%s`"
 
-#: quantum/openstack/common/lockutils.py:189
+#: neutron/openstack/common/lockutils.py:189
 #, python-format
 msgid "Got semaphore \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "已取得方法 \"%(method)s\" 的號誌 \"%(lock)s\"..."
 
-#: quantum/openstack/common/lockutils.py:200
+#: neutron/openstack/common/lockutils.py:200
 #, python-format
 msgid "Attempting to grab file lock \"%(lock)s\" for method \"%(method)s\"..."
 msgstr "正在嘗試抓取方法 \"%(method)s\" 的檔案鎖定 \"%(lock)s\"..."
 
-#: quantum/openstack/common/lockutils.py:227
+#: neutron/openstack/common/lockutils.py:227
 #, 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:235
+#: neutron/openstack/common/lockutils.py:235
 #, 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:244
+#: neutron/openstack/common/log.py:244
 #, python-format
 msgid "Deprecated: %s"
 msgstr "已淘汰：%s"
 
-#: quantum/openstack/common/log.py:336
+#: neutron/openstack/common/log.py:336
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
 msgstr ""
 
-#: quantum/openstack/common/log.py:386
+#: neutron/openstack/common/log.py:386
 #, python-format
 msgid "syslog facility must be one of: %s"
 msgstr "Syslog 機能必須是下列其中一項：%s"
 
-#: quantum/openstack/common/log.py:556
+#: neutron/openstack/common/log.py:556
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
 msgstr "呼叫已淘汰的配置時發生嚴重錯誤：%(msg)s"
 
-#: quantum/openstack/common/loopingcall.py:84
+#: neutron/openstack/common/loopingcall.py:84
 #, python-format
 msgid "task run outlasted interval by %s sec"
 msgstr "作業執行時間超出間隔 %s 秒鐘"
 
-#: quantum/openstack/common/loopingcall.py:91
+#: neutron/openstack/common/loopingcall.py:91
 msgid "in fixed duration looping call"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:131
+#: neutron/openstack/common/loopingcall.py:131
 #, python-format
 msgid "Dynamic looping call sleeping for %.02f seconds"
 msgstr ""
 
-#: quantum/openstack/common/loopingcall.py:138
+#: neutron/openstack/common/loopingcall.py:138
 msgid "in dynamic looping call"
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:42
+#: neutron/openstack/common/periodic_task.py:42
 #, python-format
 msgid "Unexpected argument for periodic task creation: %(arg)s."
 msgstr ""
 
-#: quantum/openstack/common/periodic_task.py:133
+#: neutron/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:138
+#: neutron/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:176
+#: neutron/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:184
+#: neutron/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:395
+#: neutron/openstack/common/policy.py:395
 #, python-format
 msgid "Failed to understand rule %(rule)s"
 msgstr "無法理解規則 %(rule)s"
 
-#: quantum/openstack/common/policy.py:405
+#: neutron/openstack/common/policy.py:405
 #, python-format
 msgid "No handler for matches of kind %s"
 msgstr "類型為 %s 的相符項沒有處理程式"
 
-#: quantum/openstack/common/policy.py:680
+#: neutron/openstack/common/policy.py:680
 #, python-format
 msgid "Failed to understand rule %(rule)r"
 msgstr "無法理解規則 %(rule)r"
 
-#: quantum/openstack/common/processutils.py:127
+#: neutron/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:142
+#: neutron/openstack/common/processutils.py:142
 #, python-format
 msgid "Running cmd (subprocess): %s"
 msgstr "正在執行 cmd（子程序）：%s"
 
-#: quantum/openstack/common/processutils.py:167
-#: quantum/openstack/common/processutils.py:239
+#: neutron/openstack/common/processutils.py:167
+#: neutron/openstack/common/processutils.py:239
 #, python-format
 msgid "Result was %s"
 msgstr "結果是 %s"
 
-#: quantum/openstack/common/processutils.py:179
+#: neutron/openstack/common/processutils.py:179
 #, python-format
 msgid "%r failed. Retrying."
 msgstr "%r 失敗。正在重試。"
 
-#: quantum/openstack/common/processutils.py:218
+#: neutron/openstack/common/processutils.py:218
 #, fuzzy, python-format
 msgid "Running cmd (SSH): %s"
 msgstr "正在執行 cmd（子程序）：%s"
 
-#: quantum/openstack/common/processutils.py:220
+#: neutron/openstack/common/processutils.py:220
 msgid "Environment not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/processutils.py:224
+#: neutron/openstack/common/processutils.py:224
 msgid "process_input not supported over SSH"
 msgstr ""
 
-#: quantum/openstack/common/service.py:113
-#: quantum/openstack/common/service.py:276
+#: neutron/openstack/common/service.py:113
+#: neutron/openstack/common/service.py:276
 msgid "Full set of CONF:"
 msgstr "一組完整的 CONF："
 
-#: quantum/openstack/common/service.py:122
-#: quantum/openstack/common/service.py:219
+#: neutron/openstack/common/service.py:122
+#: neutron/openstack/common/service.py:219
 #, python-format
 msgid "Caught %s, exiting"
 msgstr "已捕捉到 %s，正在結束"
 
-#: quantum/openstack/common/service.py:165
+#: neutron/openstack/common/service.py:165
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "母程序已非預期地當掉，正在結束"
 
-#: quantum/openstack/common/service.py:201
+#: neutron/openstack/common/service.py:201
 msgid "Forking too fast, sleeping"
 msgstr "分岔太快，正在休眠"
 
-#: quantum/openstack/common/service.py:224
+#: neutron/openstack/common/service.py:224
 msgid "Unhandled exception"
 msgstr "無法處理的異常狀況"
 
-#: quantum/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:231
 #, python-format
 msgid "Started child %d"
 msgstr "已啟動子項 %d"
 
-#: quantum/openstack/common/service.py:241
+#: neutron/openstack/common/service.py:241
 #, python-format
 msgid "Starting %d workers"
 msgstr "正在啟動 %d 個工作程式"
 
-#: quantum/openstack/common/service.py:258
+#: neutron/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:262
+#: neutron/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:266
+#: neutron/openstack/common/service.py:266
 #, python-format
 msgid "pid %d not in child list"
 msgstr "PID %d 不在子項清單中"
 
-#: quantum/openstack/common/service.py:294
+#: neutron/openstack/common/service.py:294
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "已捕捉到 %s，正在停止子項"
 
-#: quantum/openstack/common/service.py:305
+#: neutron/openstack/common/service.py:305
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "正在等待 %d 個子項結束"
 
-#: quantum/openstack/common/db/exception.py:44
+#: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:544
+#: neutron/openstack/common/db/sqlalchemy/session.py:544
 msgid "DB exception wrapped."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:606
+#: neutron/openstack/common/db/sqlalchemy/session.py:606
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr "已取得 mysql 伺服器已斷線的訊息：%s"
 
-#: quantum/openstack/common/db/sqlalchemy/session.py:686
+#: neutron/openstack/common/db/sqlalchemy/session.py:686
 #, python-format
 msgid "SQL connection failed. %s attempts left."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:33
+#: neutron/openstack/common/db/sqlalchemy/utils.py:33
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:72
+#: neutron/openstack/common/db/sqlalchemy/utils.py:72
 msgid "Id not in sort_keys; is sort_keys unique?"
 msgstr ""
 
-#: quantum/openstack/common/db/sqlalchemy/utils.py:120
+#: neutron/openstack/common/db/sqlalchemy/utils.py:120
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: quantum/openstack/common/notifier/api.py:125
+#: neutron/openstack/common/notifier/api.py:125
 #, python-format
 msgid "%s not in valid priorities"
 msgstr "%s 的優先順序無效"
 
-#: quantum/openstack/common/notifier/api.py:141
+#: neutron/openstack/common/notifier/api.py:141
 #, python-format
 msgid ""
 "Problem '%(e)s' attempting to send to notification system. "
 "Payload=%(payload)s"
 msgstr "嘗試傳送至通知系統時發生問題 '%(e)s'。有效負載 = %(payload)s"
 
-#: quantum/openstack/common/notifier/api.py:171
+#: neutron/openstack/common/notifier/api.py:171
 #, python-format
 msgid "Failed to load notifier %s. These notifications will not be sent."
 msgstr "無法載入通知者 %s。將不會傳送這些通知。"
 
-#: quantum/openstack/common/notifier/rabbit_notifier.py:27
+#: neutron/openstack/common/notifier/rabbit_notifier.py:27
 msgid "The rabbit_notifier is now deprecated. Please use rpc_notifier instead."
 msgstr "rabbit_notifier 現已淘汰。請改用 rpc_notifier。"
 
-#: quantum/openstack/common/notifier/rpc_notifier.py:45
-#: quantum/openstack/common/notifier/rpc_notifier2.py:51
+#: neutron/openstack/common/notifier/rpc_notifier.py:45
+#: neutron/openstack/common/notifier/rpc_notifier2.py:51
 #, python-format
 msgid "Could not send notification to %(topic)s. Payload=%(message)s"
 msgstr "無法將通知傳送給 %(topic)s。有效負載 = %(message)s"
 
-#: quantum/openstack/common/rpc/__init__.py:106
+#: neutron/openstack/common/rpc/__init__.py:106
 #, python-format
 msgid ""
 "A RPC is being made while holding a lock. The locks currently held are "
@@ -3108,96 +3121,96 @@ msgid ""
 "following: [%(stack)s]."
 msgstr "保留鎖定時執行 RPC。目前保留的鎖定是 %(locks)s。這可能是一個錯誤。請報告該錯誤。包括下列內容：[%(stack)s]。"
 
-#: quantum/openstack/common/rpc/amqp.py:61
+#: neutron/openstack/common/rpc/amqp.py:61
 msgid "Pool creating new connection"
 msgstr "儲存區正在建立新連線"
 
-#: quantum/openstack/common/rpc/amqp.py:186
+#: neutron/openstack/common/rpc/amqp.py:186
 #, python-format
 msgid "No calling threads waiting for msg_id : %(msg_id)s, message : %(data)s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:189
+#: neutron/openstack/common/rpc/amqp.py:189
 #, python-format
 msgid "_call_waiters: %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/amqp.py:196
+#: neutron/openstack/common/rpc/amqp.py:196
 #, 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:279
+#: neutron/openstack/common/rpc/amqp.py:279
 #, python-format
 msgid "unpacked context: %s"
 msgstr "已解壓縮環境定義：%s"
 
-#: quantum/openstack/common/rpc/amqp.py:325
+#: neutron/openstack/common/rpc/amqp.py:325
 #, python-format
 msgid "UNIQUE_ID is %s."
 msgstr "UNIQUE_ID 為 %s。"
 
-#: quantum/openstack/common/rpc/amqp.py:397
+#: neutron/openstack/common/rpc/amqp.py:397
 #, python-format
 msgid "received %s"
 msgstr "收到 %s"
 
-#: quantum/openstack/common/rpc/amqp.py:405
+#: neutron/openstack/common/rpc/amqp.py:405
 #, python-format
 msgid "no method for message: %s"
 msgstr "訊息沒有方法：%s"
 
-#: quantum/openstack/common/rpc/amqp.py:406
+#: neutron/openstack/common/rpc/amqp.py:406
 #, python-format
 msgid "No method for message: %s"
 msgstr "訊息沒有方法：%s"
 
-#: quantum/openstack/common/rpc/amqp.py:434
-#: quantum/openstack/common/rpc/impl_zmq.py:280
+#: neutron/openstack/common/rpc/amqp.py:434
+#: neutron/openstack/common/rpc/impl_zmq.py:280
 #, python-format
 msgid "Expected exception during message handling (%s)"
 msgstr "處理訊息期間發生預期的異常狀況 (%s)"
 
-#: quantum/openstack/common/rpc/amqp.py:442
-#: quantum/openstack/common/rpc/impl_zmq.py:286
+#: neutron/openstack/common/rpc/amqp.py:442
+#: neutron/openstack/common/rpc/impl_zmq.py:286
 msgid "Exception during message handling"
 msgstr "處理訊息期間發生異常狀況"
 
-#: quantum/openstack/common/rpc/amqp.py:516
+#: neutron/openstack/common/rpc/amqp.py:516
 #, python-format
 msgid "Making synchronous call on %s ..."
 msgstr "正在對 %s 進行同步呼叫..."
 
-#: quantum/openstack/common/rpc/amqp.py:519
+#: neutron/openstack/common/rpc/amqp.py:519
 #, python-format
 msgid "MSG_ID is %s"
 msgstr "MSG_ID 為 %s"
 
-#: quantum/openstack/common/rpc/amqp.py:545
+#: neutron/openstack/common/rpc/amqp.py:545
 #, python-format
 msgid "Making asynchronous cast on %s..."
 msgstr "正在對 %s 進行非同步強制轉型..."
 
-#: quantum/openstack/common/rpc/amqp.py:554
+#: neutron/openstack/common/rpc/amqp.py:554
 msgid "Making asynchronous fanout cast..."
 msgstr "正在進行非同步展開強制轉型..."
 
-#: quantum/openstack/common/rpc/amqp.py:582
+#: neutron/openstack/common/rpc/amqp.py:582
 #, python-format
 msgid "Sending %(event_type)s on %(topic)s"
 msgstr "正在傳送關於 %(topic)s 的 %(event_type)s"
 
-#: quantum/openstack/common/rpc/common.py:77
+#: neutron/openstack/common/rpc/common.py:77
 msgid "An unknown RPC related exception occurred."
 msgstr "發生與 RPC 相關的不明異常狀況。"
 
-#: quantum/openstack/common/rpc/common.py:89
+#: neutron/openstack/common/rpc/common.py:89
 msgid "Exception in string format operation"
 msgstr "字串格式化作業發生異常狀況"
 
-#: quantum/openstack/common/rpc/common.py:107
+#: neutron/openstack/common/rpc/common.py:107
 #, python-format
 msgid ""
 "Remote error: %(exc_type)s %(value)s\n"
@@ -3206,71 +3219,71 @@ msgstr ""
 "遠端錯誤：%(exc_type)s %(value)s\n"
 "%(traceback)s。"
 
-#: quantum/openstack/common/rpc/common.py:124
+#: neutron/openstack/common/rpc/common.py:124
 #, 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:141
-#: quantum/openstack/common/rpc/common.py:142
-#: quantum/openstack/common/rpc/common.py:143
+#: neutron/openstack/common/rpc/common.py:141
+#: neutron/openstack/common/rpc/common.py:142
+#: neutron/openstack/common/rpc/common.py:143
 msgid "<unknown>"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:147
+#: neutron/openstack/common/rpc/common.py:147
 #, python-format
 msgid "Found duplicate message(%(msg_id)s). Skipping it."
 msgstr "發現重複的訊息 (%(msg_id)s)。正在跳過該訊息。"
 
-#: quantum/openstack/common/rpc/common.py:151
+#: neutron/openstack/common/rpc/common.py:151
 msgid "Invalid reuse of an RPC connection."
 msgstr "重複使用 RPC 連線無效。"
 
-#: quantum/openstack/common/rpc/common.py:155
+#: neutron/openstack/common/rpc/common.py:155
 #, python-format
 msgid "Specified RPC version, %(version)s, not supported by this endpoint."
 msgstr "此端點不支援所指定的 RPC 版本 %(version)s。"
 
-#: quantum/openstack/common/rpc/common.py:160
+#: neutron/openstack/common/rpc/common.py:160
 #, python-format
 msgid ""
 "Specified RPC envelope version, %(version)s, not supported by this "
 "endpoint."
 msgstr "此端點不支援所指定的 RPC 封套版本 %(version)s。"
 
-#: quantum/openstack/common/rpc/common.py:165
+#: neutron/openstack/common/rpc/common.py:165
 #, python-format
 msgid "Specified RPC version cap, %(version_cap)s, is too low"
 msgstr ""
 
-#: quantum/openstack/common/rpc/common.py:288
+#: neutron/openstack/common/rpc/common.py:288
 #, python-format
 msgid "Failed to sanitize %(item)s. Key error %(err)s"
 msgstr "無法清理 %(item)s。索引鍵錯誤 %(err)s"
 
-#: quantum/openstack/common/rpc/common.py:310
+#: neutron/openstack/common/rpc/common.py:310
 #, python-format
 msgid "Returning exception %s to caller"
 msgstr "正在將異常狀況 %s 傳回至呼叫程式"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:169
-#: quantum/openstack/common/rpc/impl_qpid.py:153
+#: neutron/openstack/common/rpc/impl_kombu.py:169
+#: neutron/openstack/common/rpc/impl_qpid.py:153
 msgid "Failed to process message... skipping it."
 msgstr "無法處理訊息... 正在跳過。"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:481
+#: neutron/openstack/common/rpc/impl_kombu.py:481
 #, python-format
 msgid "Reconnecting to AMQP server on %(hostname)s:%(port)d"
 msgstr "正在重新連接至 %(hostname)s:%(port)d 上的 AMQP 伺服器"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:503
+#: neutron/openstack/common/rpc/impl_kombu.py:503
 #, python-format
 msgid "Connected to AMQP server on %(hostname)s:%(port)d"
 msgstr "已連接至 %(hostname)s:%(port)d 上的 AMQP 伺服器"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:540
+#: neutron/openstack/common/rpc/impl_kombu.py:540
 #, python-format
 msgid ""
 "Unable to connect to AMQP server on %(hostname)s:%(port)d after "
@@ -3279,7 +3292,7 @@ msgstr ""
 "嘗試 %(max_retries)d 次之後，仍無法連接至 %(hostname)s:%(port)d 上的 AMQP "
 "伺服器：%(err_str)s"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:556
+#: neutron/openstack/common/rpc/impl_kombu.py:556
 #, python-format
 msgid ""
 "AMQP server on %(hostname)s:%(port)d is unreachable: %(err_str)s. Trying "
@@ -3288,259 +3301,259 @@ msgstr ""
 "無法抵達 %(hostname)s:%(port)d 上的 AMQP 伺服器：%(err_str)s。將要在 %(sleep_time)d "
 "秒鐘後重試。"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:610
-#: quantum/openstack/common/rpc/impl_qpid.py:457
+#: neutron/openstack/common/rpc/impl_kombu.py:610
+#: neutron/openstack/common/rpc/impl_qpid.py:457
 #, python-format
 msgid "Failed to declare consumer for topic '%(topic)s': %(err_str)s"
 msgstr "無法給主題 '%(topic)s' 宣告消費者：%(err_str)s"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:628
-#: quantum/openstack/common/rpc/impl_qpid.py:472
+#: neutron/openstack/common/rpc/impl_kombu.py:628
+#: neutron/openstack/common/rpc/impl_qpid.py:472
 #, python-format
 msgid "Timed out waiting for RPC response: %s"
 msgstr "等候 RPC 回應時發生逾時：%s"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:632
-#: quantum/openstack/common/rpc/impl_qpid.py:476
+#: neutron/openstack/common/rpc/impl_kombu.py:632
+#: neutron/openstack/common/rpc/impl_qpid.py:476
 #, python-format
 msgid "Failed to consume message from queue: %s"
 msgstr "無法耗用來自佇列的訊息：%s"
 
-#: quantum/openstack/common/rpc/impl_kombu.py:671
-#: quantum/openstack/common/rpc/impl_qpid.py:511
+#: neutron/openstack/common/rpc/impl_kombu.py:671
+#: neutron/openstack/common/rpc/impl_qpid.py:511
 #, python-format
 msgid "Failed to publish message to topic '%(topic)s': %(err_str)s"
 msgstr "無法將訊息發佈至主題 '%(topic)s'：%(err_str)s"
 
-#: quantum/openstack/common/rpc/impl_qpid.py:399
+#: neutron/openstack/common/rpc/impl_qpid.py:399
 #, python-format
 msgid "Unable to connect to AMQP server: %(e)s. Sleeping %(delay)s seconds"
 msgstr "無法連接至 AMQP 伺服器：%(e)s。休眠 %(delay)s 秒鐘"
 
-#: quantum/openstack/common/rpc/impl_qpid.py:405
+#: neutron/openstack/common/rpc/impl_qpid.py:405
 #, python-format
 msgid "Connected to AMQP server on %s"
 msgstr "已連接至 %s 上的 AMQP 伺服器"
 
-#: quantum/openstack/common/rpc/impl_qpid.py:418
+#: neutron/openstack/common/rpc/impl_qpid.py:418
 msgid "Re-established AMQP queues"
 msgstr "已重新建立 AMQP 佇列"
 
-#: quantum/openstack/common/rpc/impl_qpid.py:484
+#: neutron/openstack/common/rpc/impl_qpid.py:484
 msgid "Error processing message.  Skipping it."
 msgstr "處理訊息時發生錯誤。正在跳過。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:96
+#: neutron/openstack/common/rpc/impl_zmq.py:96
 msgid "JSON serialization failed."
 msgstr "JSON 序列化失敗。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:101
+#: neutron/openstack/common/rpc/impl_zmq.py:101
 #, python-format
 msgid "Deserializing: %s"
 msgstr "正在解除序列化：%s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:136
+#: neutron/openstack/common/rpc/impl_zmq.py:136
 #, python-format
 msgid "Connecting to %(addr)s with %(type)s"
 msgstr "正在連接至 %(addr)s (%(type)s)"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:137
+#: neutron/openstack/common/rpc/impl_zmq.py:137
 #, python-format
 msgid "-> Subscribed to %(subscribe)s"
 msgstr "-> 已訂閱 %(subscribe)s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:138
+#: neutron/openstack/common/rpc/impl_zmq.py:138
 #, python-format
 msgid "-> bind: %(bind)s"
 msgstr "-> 連結：%(bind)s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:146
+#: neutron/openstack/common/rpc/impl_zmq.py:146
 msgid "Could not open socket."
 msgstr "無法開啟 Socket。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:158
+#: neutron/openstack/common/rpc/impl_zmq.py:158
 #, python-format
 msgid "Subscribing to %s"
 msgstr "正在訂閱 %s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:200
+#: neutron/openstack/common/rpc/impl_zmq.py:200
 msgid "You cannot recv on this socket."
 msgstr "無法在此 Socket 上接收。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:205
+#: neutron/openstack/common/rpc/impl_zmq.py:205
 msgid "You cannot send on this socket."
 msgstr "無法在此 Socket 上傳送。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:267
+#: neutron/openstack/common/rpc/impl_zmq.py:267
 #, python-format
 msgid "Running func with context: %s"
 msgstr "正在以環境定義 %s 執行函數"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:305
+#: neutron/openstack/common/rpc/impl_zmq.py:305
 msgid "Sending reply"
 msgstr "正在傳送回覆"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:339
+#: neutron/openstack/common/rpc/impl_zmq.py:339
 msgid "RPC message did not include method."
 msgstr "RPC 訊息沒有包含方法。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:373
+#: neutron/openstack/common/rpc/impl_zmq.py:373
 msgid "Registering reactor"
 msgstr "正在登錄反應程式"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:385
+#: neutron/openstack/common/rpc/impl_zmq.py:385
 msgid "In reactor registered"
 msgstr "已登錄輸入反應程式"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:400
+#: neutron/openstack/common/rpc/impl_zmq.py:400
 msgid "Out reactor registered"
 msgstr "已登錄輸出反應程式"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:404
+#: neutron/openstack/common/rpc/impl_zmq.py:404
 msgid "Consuming socket"
 msgstr "正在耗用 Socket"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:454
+#: neutron/openstack/common/rpc/impl_zmq.py:454
 #, python-format
 msgid "Creating proxy for topic: %s"
 msgstr "正在給主題 %s 建立 Proxy"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:460
+#: neutron/openstack/common/rpc/impl_zmq.py:460
 msgid "Topic contained dangerous characters."
 msgstr "主題包含危險字元。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:492
+#: neutron/openstack/common/rpc/impl_zmq.py:492
 msgid "Topic socket file creation failed."
 msgstr "建立主題 Socket 檔案時失敗。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:498
+#: neutron/openstack/common/rpc/impl_zmq.py:498
 #, python-format
 msgid "Local per-topic backlog buffer full for topic %(topic)s. Dropping message."
 msgstr "主題 %(topic)s 的本端個別主題待辦事項緩衝區已滿。正在捨棄訊息。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:514
+#: neutron/openstack/common/rpc/impl_zmq.py:514
 #, python-format
 msgid "Required IPC directory does not exist at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:524
+#: neutron/openstack/common/rpc/impl_zmq.py:524
 #, python-format
 msgid "Permission denied to IPC directory at %s"
 msgstr ""
 
-#: quantum/openstack/common/rpc/impl_zmq.py:527
+#: neutron/openstack/common/rpc/impl_zmq.py:527
 msgid "Could not create ZeroMQ receiver daemon. Socket may already be in use."
 msgstr "無法建立 ZeroMQ 接收端常駐程式。Socket 可能已在使用中。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:561
+#: neutron/openstack/common/rpc/impl_zmq.py:561
 #, python-format
 msgid "CONSUMER RECEIVED DATA: %s"
 msgstr "消費者已收到資料：%s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:563
+#: neutron/openstack/common/rpc/impl_zmq.py:563
 #, python-format
 msgid "ROUTER RELAY-OUT %(data)s"
 msgstr "路由器轉播 %(data)s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:585
+#: neutron/openstack/common/rpc/impl_zmq.py:585
 msgid "ZMQ Envelope version unsupported or unknown."
 msgstr "ZMQ 封套版本不受支援或不明。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:613
+#: neutron/openstack/common/rpc/impl_zmq.py:613
 msgid "Skipping topic registration. Already registered."
 msgstr "正在跳過主題登錄。已登錄。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:620
+#: neutron/openstack/common/rpc/impl_zmq.py:620
 #, python-format
 msgid "Consumer is a zmq.%s"
 msgstr "消費者是 zmq.%s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:672
+#: neutron/openstack/common/rpc/impl_zmq.py:672
 msgid "Creating payload"
 msgstr "正在建立有效負載"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:685
+#: neutron/openstack/common/rpc/impl_zmq.py:685
 msgid "Creating queue socket for reply waiter"
 msgstr "正在給回覆等待程式建立佇列 Socket"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:698
+#: neutron/openstack/common/rpc/impl_zmq.py:698
 msgid "Sending cast"
 msgstr "正在傳送強制轉型"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:701
+#: neutron/openstack/common/rpc/impl_zmq.py:701
 msgid "Cast sent; Waiting reply"
 msgstr "已傳送強制轉型；正在等待回覆"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:704
+#: neutron/openstack/common/rpc/impl_zmq.py:704
 #, python-format
 msgid "Received message: %s"
 msgstr "接收的訊息：%s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:705
+#: neutron/openstack/common/rpc/impl_zmq.py:705
 msgid "Unpacking response"
 msgstr "正在解壓縮回應"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:714
+#: neutron/openstack/common/rpc/impl_zmq.py:714
 msgid "Unsupported or unknown ZMQ envelope returned."
 msgstr "傳回了不支援或不明的 ZMQ 封套。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:721
+#: neutron/openstack/common/rpc/impl_zmq.py:721
 msgid "RPC Message Invalid."
 msgstr "RPC 訊息無效。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:744
-#: quantum/plugins/midonet/plugin.py:42
+#: neutron/openstack/common/rpc/impl_zmq.py:744
+#: neutron/plugins/midonet/plugin.py:42
 #, python-format
 msgid "%(msg)s"
 msgstr "%(msg)s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:747
+#: neutron/openstack/common/rpc/impl_zmq.py:747
 #, python-format
 msgid "Sending message(s) to: %s"
 msgstr "正在將訊息傳送至：%s"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:751
+#: neutron/openstack/common/rpc/impl_zmq.py:751
 msgid "No matchmaker results. Not casting."
 msgstr "符合程式找不到結果。不進行強制轉型。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:754
+#: neutron/openstack/common/rpc/impl_zmq.py:754
 msgid "No match from matchmaker."
 msgstr "沒有來自符合程式的相符項。"
 
-#: quantum/openstack/common/rpc/impl_zmq.py:836
+#: neutron/openstack/common/rpc/impl_zmq.py:836
 #, python-format
 msgid "rpc_zmq_matchmaker = %(orig)s is deprecated; use %(new)s instead"
 msgstr ""
 
-#: quantum/openstack/common/rpc/matchmaker.py:47
+#: neutron/openstack/common/rpc/matchmaker.py:47
 msgid "Match not found by MatchMaker."
 msgstr "符合程式找不到相符項。"
 
-#: quantum/openstack/common/rpc/matchmaker.py:81
+#: neutron/openstack/common/rpc/matchmaker.py:81
 msgid "Matchmaker does not implement registration or heartbeat."
 msgstr "符合程式沒有實作登錄或活動訊號。"
 
-#: quantum/openstack/common/rpc/matchmaker.py:217
+#: neutron/openstack/common/rpc/matchmaker.py:217
 #, fuzzy, python-format
 msgid "Matchmaker unregistered: %(key)s, %(host)s"
 msgstr "已取消登錄符合程式：%s，%s"
 
-#: quantum/openstack/common/rpc/matchmaker.py:229
+#: neutron/openstack/common/rpc/matchmaker.py:229
 msgid "Register before starting heartbeat."
 msgstr "在啟動活動訊號之前登錄。"
 
-#: quantum/openstack/common/rpc/matchmaker_ring.py:79
-#: quantum/openstack/common/rpc/matchmaker_ring.py:97
+#: neutron/openstack/common/rpc/matchmaker_ring.py:79
+#: neutron/openstack/common/rpc/matchmaker_ring.py:97
 #, python-format
 msgid "No key defining hosts for topic '%s', see ringfile"
 msgstr "沒有索引鍵給主題 '%s' 定義主機，請參閱 ringfile"
 
-#: quantum/openstack/common/rpc/service.py:48
+#: neutron/openstack/common/rpc/service.py:48
 #, python-format
 msgid "Creating Consumer connection for Service %s"
 msgstr "正在為服務 %s 建立消費者連線"
 
-#: quantum/plugins/bigswitch/plugin.py:85
+#: neutron/plugins/bigswitch/plugin.py:85
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3549,39 +3562,39 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: neutron/plugins/bigswitch/plugin.py:92
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:95
+#: neutron/plugins/bigswitch/plugin.py:95
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:98
+#: neutron/plugins/bigswitch/plugin.py:98
 msgid "Sync data on connect"
 msgstr "在連接時同步資料"
 
-#: quantum/plugins/bigswitch/plugin.py:100
+#: neutron/plugins/bigswitch/plugin.py:100
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr "等候 Proxy 要求連接並完成的秒數上限。"
 
-#: quantum/plugins/bigswitch/plugin.py:103
-msgid "User defined identifier for this Quantum deployment"
-msgstr "此 Quantum 部署的使用者定義 ID"
+#: neutron/plugins/bigswitch/plugin.py:104
+msgid "User defined identifier for this Neutron deployment"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:105
+#: neutron/plugins/bigswitch/plugin.py:106
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr "用來決定是否應該將 meta 資料伺服器路徑注入 VM 的旗標"
 
-#: quantum/plugins/bigswitch/plugin.py:114
+#: neutron/plugins/bigswitch/plugin.py:115
 msgid ""
 "The default router rules installed in new tenant routers. Repeat the "
 "config option for each rule. Format is "
@@ -3589,1148 +3602,1143 @@ msgid ""
 "all tenants."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:119
+#: neutron/plugins/bigswitch/plugin.py:120
 msgid "Maximum number of router rules"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:126
+#: neutron/plugins/bigswitch/plugin.py:127
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:133
+#: neutron/plugins/bigswitch/plugin.py:134
 #, python-format
 msgid "Nova compute nodes to manually set VIF type to %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:167
+#: neutron/plugins/bigswitch/plugin.py:168
 msgid "Error in REST call to remote network controller"
 msgstr "對遠端網路控制器進行 REST 呼叫時發生錯誤"
 
-#: quantum/plugins/bigswitch/plugin.py:203
+#: neutron/plugins/bigswitch/plugin.py:204
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr "ServerProxy：伺服器 = %(server)s，埠 = %(port)d，SSL = %(ssl)r，操作 = %(action)s"
 
-#: quantum/plugins/bigswitch/plugin.py:207
+#: neutron/plugins/bigswitch/plugin.py:208
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr "ServerProxy：資源 = %(resource)s，資料 = %(data)r，標頭 = %(headers)r"
 
-#: quantum/plugins/bigswitch/plugin.py:216
+#: neutron/plugins/bigswitch/plugin.py:217
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr "ServerProxy：無法建立 HTTPS 連線"
 
-#: quantum/plugins/bigswitch/plugin.py:223
+#: neutron/plugins/bigswitch/plugin.py:224
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr "ServerProxy：無法建立 HTTP 連線"
 
-#: quantum/plugins/bigswitch/plugin.py:240
+#: neutron/plugins/bigswitch/plugin.py:241
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr "ServerProxy：%(action)s 失敗，%(e)r"
 
-#: quantum/plugins/bigswitch/plugin.py:244
+#: neutron/plugins/bigswitch/plugin.py:245
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr "ServerProxy：狀態 = %(status)d，原因 = %(reason)r，ret = %(ret)s，資料 = %(data)r"
 
-#: quantum/plugins/bigswitch/plugin.py:294
+#: neutron/plugins/bigswitch/plugin.py:295
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr "ServerProxy：對伺服器 %(server)r 執行的 %(action)s 失敗"
 
-#: quantum/plugins/bigswitch/plugin.py:302
+#: neutron/plugins/bigswitch/plugin.py:303
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr "ServerProxy：對所有伺服器 %(server)r 執行的 %(action)s 失敗"
 
-#: quantum/plugins/bigswitch/plugin.py:337
+#: neutron/plugins/bigswitch/plugin.py:338
 #, python-format
-msgid "QuantumRestProxy: Starting plugin. Version=%s"
-msgstr "QuantumRestProxy：正在啟動外掛程式。版本 = %s"
+msgid "NeutronRestProxy: Starting plugin. Version=%s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:379
-msgid "QuantumRestProxyV2: initialization done"
-msgstr "QuantumRestProxyV2：已完成起始設定"
+#: neutron/plugins/bigswitch/plugin.py:380
+msgid "NeutronRestProxyV2: initialization done"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:405
-msgid "QuantumRestProxyV2: create_network() called"
-msgstr "QuantumRestProxyV2：已呼叫 create_network()"
+#: neutron/plugins/bigswitch/plugin.py:406
+msgid "NeutronRestProxyV2: create_network() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:430
+#: neutron/plugins/bigswitch/plugin.py:431
 #, python-format
-msgid "QuantumRestProxyV2:Unable to create remote network: %s"
-msgstr "QuantumRestProxyV2：無法建立遠端網路：%s"
+msgid "NeutronRestProxyV2:Unable to create remote network: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:462
-msgid "QuantumRestProxyV2.update_network() called"
-msgstr "已呼叫 QuantumRestProxyV2.update_network()"
+#: neutron/plugins/bigswitch/plugin.py:463
+msgid "NeutronRestProxyV2.update_network() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:479
-#: quantum/plugins/bigswitch/plugin.py:527
-#: quantum/plugins/bigswitch/plugin.py:1280
+#: neutron/plugins/bigswitch/plugin.py:480
+#: neutron/plugins/bigswitch/plugin.py:528
+#: neutron/plugins/bigswitch/plugin.py:1281
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote network: %s"
-msgstr "QuantumRestProxyV2：無法更新遠端網路：%s"
+msgid "NeutronRestProxyV2: Unable to update remote network: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:500
-msgid "QuantumRestProxyV2: delete_network() called"
-msgstr "QuantumRestProxyV2：已呼叫 delete_network()"
+#: neutron/plugins/bigswitch/plugin.py:501
+msgid "NeutronRestProxyV2: delete_network() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:557
-msgid "QuantumRestProxyV2: create_port() called"
-msgstr "QuantumRestProxyV2：已呼叫 create_port()"
+#: neutron/plugins/bigswitch/plugin.py:558
+msgid "NeutronRestProxyV2: create_port() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:592
-#: quantum/plugins/bigswitch/plugin.py:683
+#: neutron/plugins/bigswitch/plugin.py:593
+#: neutron/plugins/bigswitch/plugin.py:684
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote port: %s"
-msgstr "QuantumRestProxyV2：無法建立遠端埠：%s"
+msgid "NeutronRestProxyV2: Unable to create remote port: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:647
-msgid "QuantumRestProxyV2: update_port() called"
-msgstr "QuantumRestProxyV2：已呼叫 update_port()"
+#: neutron/plugins/bigswitch/plugin.py:648
+msgid "NeutronRestProxyV2: update_port() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:704
-msgid "QuantumRestProxyV2: delete_port() called"
-msgstr "QuantumRestProxyV2：已呼叫 delete_port()"
+#: neutron/plugins/bigswitch/plugin.py:705
+msgid "NeutronRestProxyV2: delete_port() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
-#: quantum/plugins/bigswitch/plugin.py:796
+#: neutron/plugins/bigswitch/plugin.py:739
+#: neutron/plugins/bigswitch/plugin.py:797
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote port: %s"
-msgstr "QuantumRestProxyV2：無法更新遠端埠：%s"
+msgid "NeutronRestProxyV2: Unable to update remote port: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:755
-msgid "QuantumRestProxyV2: _plug_interface() called"
-msgstr "QuantumRestProxyV2：已呼叫 _plug_interface()"
+#: neutron/plugins/bigswitch/plugin.py:756
+msgid "NeutronRestProxyV2: _plug_interface() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:773
+#: neutron/plugins/bigswitch/plugin.py:774
 #, python-format
-msgid "QuantumRestProxyV2:Unable to update remote network: %s"
-msgstr "QuantumRestProxyV2：無法更新遠端網路：%s"
+msgid "NeutronRestProxyV2:Unable to update remote network: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:787
-msgid "QuantumRestProxyV2: _unplug_interface() called"
-msgstr "QuantumRestProxyV2：已呼叫 _unplug_interface()"
+#: neutron/plugins/bigswitch/plugin.py:788
+msgid "NeutronRestProxyV2: _unplug_interface() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:800
-msgid "QuantumRestProxyV2: create_subnet() called"
-msgstr "QuantumRestProxyV2：已呼叫 create_subnet()"
+#: neutron/plugins/bigswitch/plugin.py:801
+msgid "NeutronRestProxyV2: create_subnet() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:821
-msgid "QuantumRestProxyV2: update_subnet() called"
-msgstr "QuantumRestProxyV2：已呼叫 update_subnet()"
+#: neutron/plugins/bigswitch/plugin.py:822
+msgid "NeutronRestProxyV2: update_subnet() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:844
-msgid "QuantumRestProxyV2: delete_subnet() called"
-msgstr "QuantumRestProxyV2：已呼叫 delete_subnet()"
+#: neutron/plugins/bigswitch/plugin.py:845
+msgid "NeutronRestProxyV2: delete_subnet() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:885
-msgid "QuantumRestProxyV2: create_router() called"
-msgstr "QuantumRestProxyV2：已呼叫 create_router()"
+#: neutron/plugins/bigswitch/plugin.py:886
+msgid "NeutronRestProxyV2: create_router() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:910
+#: neutron/plugins/bigswitch/plugin.py:911
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote router: %s"
-msgstr "QuantumRestProxyV2：無法建立遠端路由器：%s"
+msgid "NeutronRestProxyV2: Unable to create remote router: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:921
-msgid "QuantumRestProxyV2.update_router() called"
-msgstr "已呼叫 QuantumRestProxyV2.update_router()"
+#: neutron/plugins/bigswitch/plugin.py:922
+msgid "NeutronRestProxyV2.update_router() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:943
+#: neutron/plugins/bigswitch/plugin.py:944
 #, python-format
-msgid "QuantumRestProxyV2: Unable to update remote router: %s"
-msgstr "QuantumRestProxyV2：無法更新遠端路由器：%s"
+msgid "NeutronRestProxyV2: Unable to update remote router: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:955
-msgid "QuantumRestProxyV2: delete_router() called"
-msgstr "QuantumRestProxyV2：已呼叫 delete_router()"
+#: neutron/plugins/bigswitch/plugin.py:956
+msgid "NeutronRestProxyV2: delete_router() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:986
+#: neutron/plugins/bigswitch/plugin.py:987
 #, python-format
-msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
-msgstr "QuantumRestProxyV2：無法刪除遠端路由器：%s"
+msgid "NeutronRestProxyV2: Unable to delete remote router: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:992
-msgid "QuantumRestProxyV2: add_router_interface() called"
-msgstr "QuantumRestProxyV2：已呼叫 add_router_interface()"
+#: neutron/plugins/bigswitch/plugin.py:993
+msgid "NeutronRestProxyV2: add_router_interface() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1020
+#: neutron/plugins/bigswitch/plugin.py:1021
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create interface: %s"
-msgstr "QuantumRestProxyV2：無法建立介面：%s"
+msgid "NeutronRestProxyV2: Unable to create interface: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1031
-msgid "QuantumRestProxyV2: remove_router_interface() called"
-msgstr "QuantumRestProxyV2：已呼叫 remove_router_interface()"
+#: neutron/plugins/bigswitch/plugin.py:1032
+msgid "NeutronRestProxyV2: remove_router_interface() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1064
+#: neutron/plugins/bigswitch/plugin.py:1065
 #, python-format
-msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
-msgstr "QuantumRestProxyV2：無法刪除遠端介面：%s"
+msgid "NeutronRestProxyV2:Unable to delete remote intf: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1072
-msgid "QuantumRestProxyV2: create_floatingip() called"
-msgstr "QuantumRestProxyV2：已呼叫 create_floatingip()"
+#: neutron/plugins/bigswitch/plugin.py:1073
+msgid "NeutronRestProxyV2: create_floatingip() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1085
+#: neutron/plugins/bigswitch/plugin.py:1086
 #, python-format
-msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
-msgstr "QuantumRestProxyV2：無法建立遠端浮動 IP：%s"
+msgid "NeutronRestProxyV2: Unable to create remote floatin IP: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1095
-msgid "QuantumRestProxyV2: update_floatingip() called"
-msgstr "QuantumRestProxyV2：已呼叫 update_floatingip()"
+#: neutron/plugins/bigswitch/plugin.py:1096
+msgid "NeutronRestProxyV2: update_floatingip() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1118
-msgid "QuantumRestProxyV2: delete_floatingip() called"
-msgstr "QuantumRestProxyV2：已呼叫 delete_floatingip()"
+#: neutron/plugins/bigswitch/plugin.py:1119
+msgid "NeutronRestProxyV2: delete_floatingip() called"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1201
+#: neutron/plugins/bigswitch/plugin.py:1202
 #, python-format
-msgid "QuantumRestProxy: Unable to update remote topology: %s"
-msgstr "QuantumRestProxy：無法更新遠端拓蹼：%s"
+msgid "NeutronRestProxy: Unable to update remote topology: %s"
+msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1297
+#: neutron/plugins/bigswitch/plugin.py:1298
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr "此外掛程式版本不支援設定 admin_state_up = False。正在忽略對資源的設定：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:1303
+#: neutron/plugins/bigswitch/plugin.py:1304
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr "作業狀態是由外掛程式在內部設定。正在忽略設定狀態 = %s。"
 
-#: quantum/plugins/bigswitch/plugin.py:1330
+#: neutron/plugins/bigswitch/plugin.py:1331
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:43
+#: neutron/plugins/bigswitch/db/porttracker_db.py:43
 msgid "No host_id in port request to track port location."
 msgstr ""
 
-#: quantum/plugins/bigswitch/db/porttracker_db.py:46
+#: neutron/plugins/bigswitch/db/porttracker_db.py:46
 #, python-format
 msgid "Received an empty port ID for host '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:30
+#: neutron/plugins/bigswitch/extensions/routerrule.py:30
 #, python-format
 msgid "Invalid format for router rules: %(rule)s, %(reason)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:34
+#: neutron/plugins/bigswitch/extensions/routerrule.py:34
 #, python-format
 msgid ""
 "Unable to complete rules update for %(router_id)s. The number of rules "
 "exceeds the maximum %(quota)s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:50
+#: neutron/plugins/bigswitch/extensions/routerrule.py:50
 #, python-format
 msgid "Invalid data format for router rule: '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:82
+#: neutron/plugins/bigswitch/extensions/routerrule.py:82
 #, python-format
 msgid "Duplicate nexthop in rule '%s'"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:90
+#: neutron/plugins/bigswitch/extensions/routerrule.py:90
 #, python-format
 msgid "Action must be either permit or deny. '%s' was provided"
 msgstr ""
 
-#: quantum/plugins/bigswitch/extensions/routerrule.py:102
+#: neutron/plugins/bigswitch/extensions/routerrule.py:102
 #, python-format
 msgid "Duplicate router rules (src,dst)  found '%s'"
 msgstr ""
 
-#: quantum/plugins/brocade/QuantumPlugin.py:125
-#: quantum/plugins/hyperv/rpc_callbacks.py:53
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:85
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:95
+#: neutron/plugins/brocade/NeutronPlugin.py:125
+#: neutron/plugins/hyperv/rpc_callbacks.py:53
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:85
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:95
 #, python-format
 msgid "Device %(device)s details requested from %(agent_id)s"
 msgstr "從 %(agent_id)s 要求的裝置 %(device)s 詳細資料"
 
-#: quantum/plugins/brocade/QuantumPlugin.py:139
-#: quantum/plugins/brocade/QuantumPlugin.py:156
-#: quantum/plugins/hyperv/rpc_callbacks.py:69
-#: quantum/plugins/hyperv/rpc_callbacks.py:88
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:108
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:128
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:143
-#: quantum/plugins/mlnx/rpc_callbacks.py:108
-#: quantum/plugins/mlnx/rpc_callbacks.py:123
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:113
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:133
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:148
+#: neutron/plugins/brocade/NeutronPlugin.py:139
+#: neutron/plugins/brocade/NeutronPlugin.py:156
+#: neutron/plugins/hyperv/rpc_callbacks.py:69
+#: neutron/plugins/hyperv/rpc_callbacks.py:88
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:108
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:128
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:143
+#: neutron/plugins/mlnx/rpc_callbacks.py:108
+#: neutron/plugins/mlnx/rpc_callbacks.py:123
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:113
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:133
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:148
 #, python-format
 msgid "%s can not be found in database"
 msgstr "在資料庫中找不到 %s"
 
-#: quantum/plugins/brocade/QuantumPlugin.py:275
-#: quantum/plugins/brocade/QuantumPlugin.py:318
-#: quantum/plugins/brocade/QuantumPlugin.py:368
+#: neutron/plugins/brocade/NeutronPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:320
+#: neutron/plugins/brocade/NeutronPlugin.py:370
 msgid "Brocade NOS driver:"
 msgstr "Brocade NOS 驅動程式："
 
-#: quantum/plugins/brocade/QuantumPlugin.py:276
-#: quantum/plugins/brocade/QuantumPlugin.py:319
-#: quantum/plugins/brocade/QuantumPlugin.py:369
+#: neutron/plugins/brocade/NeutronPlugin.py:278
+#: neutron/plugins/brocade/NeutronPlugin.py:321
+#: neutron/plugins/brocade/NeutronPlugin.py:371
 #, python-format
 msgid "%s"
 msgstr "%s"
 
-#: quantum/plugins/brocade/QuantumPlugin.py:277
+#: neutron/plugins/brocade/NeutronPlugin.py:279
 #, python-format
 msgid "Returning the allocated vlan (%d) to the pool"
 msgstr "正在將已配置的 VLAN (%d) 傳回給儲存區"
 
-#: quantum/plugins/brocade/QuantumPlugin.py:285
+#: neutron/plugins/brocade/NeutronPlugin.py:287
 #, python-format
 msgid "Allocated vlan (%d) from the pool"
 msgstr "已從儲存區配置 VLAN (%d)"
 
-#: quantum/plugins/brocade/nos/nosdriver.py:63
+#: neutron/plugins/brocade/nos/nosdriver.py:63
 #, python-format
 msgid "Connect failed to switch: %s"
 msgstr "無法連接交換器：%s"
 
-#: quantum/plugins/brocade/nos/nosdriver.py:66
+#: neutron/plugins/brocade/nos/nosdriver.py:66
 #, python-format
 msgid "Connect success to host %(host)s:%(ssh_port)d"
 msgstr ""
 
-#: quantum/plugins/cisco/network_plugin.py:75
+#: neutron/plugins/cisco/network_plugin.py:75
 #, python-format
 msgid "Model %s manages state"
 msgstr "由模型 %s 管理狀態"
 
-#: quantum/plugins/cisco/network_plugin.py:88
+#: neutron/plugins/cisco/network_plugin.py:88
 msgid "Plugin initialization complete"
 msgstr "已完成外掛程式起始設定"
 
-#: quantum/plugins/cisco/network_plugin.py:134
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:205
+#: neutron/plugins/cisco/network_plugin.py:134
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:205
 msgid "create_network() called"
 msgstr "已呼叫 create_network()"
 
-#: quantum/plugins/cisco/network_plugin.py:151
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:226
+#: neutron/plugins/cisco/network_plugin.py:151
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:226
 msgid "update_network() called"
 msgstr "已呼叫 update_network()"
 
-#: quantum/plugins/cisco/network_plugin.py:164
+#: neutron/plugins/cisco/network_plugin.py:164
 msgid "delete_network() called"
 msgstr "已呼叫 delete_network()"
 
-#: quantum/plugins/cisco/network_plugin.py:187
+#: neutron/plugins/cisco/network_plugin.py:187
 msgid "get_network() called"
 msgstr "已呼叫 get_network()"
 
-#: quantum/plugins/cisco/network_plugin.py:192
+#: neutron/plugins/cisco/network_plugin.py:192
 msgid "get_networks() called"
 msgstr "已呼叫 get_networks()"
 
-#: quantum/plugins/cisco/network_plugin.py:197
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:282
+#: neutron/plugins/cisco/network_plugin.py:197
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:282
 msgid "create_port() called"
 msgstr "已呼叫 create_port()"
 
-#: quantum/plugins/cisco/network_plugin.py:207
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:368
+#: neutron/plugins/cisco/network_plugin.py:207
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:368
 msgid "delete_port() called"
 msgstr "已呼叫 delete_port()"
 
-#: quantum/plugins/cisco/network_plugin.py:226
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:327
+#: neutron/plugins/cisco/network_plugin.py:226
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:327
 msgid "update_port() called"
 msgstr "已呼叫 update_port()"
 
-#: quantum/plugins/cisco/network_plugin.py:237
+#: neutron/plugins/cisco/network_plugin.py:237
 msgid "create_subnet() called"
 msgstr "已呼叫 create_subnet()"
 
-#: quantum/plugins/cisco/network_plugin.py:249
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
+#: neutron/plugins/cisco/network_plugin.py:249
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:266
 msgid "update_subnet() called"
 msgstr "已呼叫 update_subnet()"
 
-#: quantum/plugins/cisco/network_plugin.py:255
+#: neutron/plugins/cisco/network_plugin.py:255
 msgid "delete_subnet() called"
 msgstr "已呼叫 delete_subnet()"
 
-#: quantum/plugins/cisco/network_plugin.py:278
-#: quantum/plugins/cisco/db/l2network_db.py:201
-#: quantum/plugins/cisco/db/network_db_v2.py:198
+#: neutron/plugins/cisco/network_plugin.py:278
+#: neutron/plugins/cisco/db/l2network_db.py:201
+#: neutron/plugins/cisco/db/network_db_v2.py:130
 msgid "get_all_qoss() called"
 msgstr "已呼叫 get_all_qoss()"
 
-#: quantum/plugins/cisco/network_plugin.py:284
+#: neutron/plugins/cisco/network_plugin.py:284
 msgid "get_qos_details() called"
 msgstr "已呼叫 get_qos_details()"
 
-#: quantum/plugins/cisco/network_plugin.py:294
+#: neutron/plugins/cisco/network_plugin.py:294
 msgid "create_qos() called"
 msgstr "已呼叫 create_qos()"
 
-#: quantum/plugins/cisco/network_plugin.py:300
+#: neutron/plugins/cisco/network_plugin.py:300
 msgid "delete_qos() called"
 msgstr "已呼叫 delete_qos()"
 
-#: quantum/plugins/cisco/network_plugin.py:310
+#: neutron/plugins/cisco/network_plugin.py:310
 msgid "rename_qos() called"
 msgstr "已呼叫 rename_qos()"
 
-#: quantum/plugins/cisco/network_plugin.py:321
+#: neutron/plugins/cisco/network_plugin.py:321
 msgid "get_all_credentials() called"
 msgstr "已呼叫 get_all_credentials()"
 
-#: quantum/plugins/cisco/network_plugin.py:327
+#: neutron/plugins/cisco/network_plugin.py:327
 msgid "get_credential_details() called"
 msgstr "已呼叫 get_credential_details()"
 
-#: quantum/plugins/cisco/network_plugin.py:338
+#: neutron/plugins/cisco/network_plugin.py:338
 msgid "create_credential() called"
 msgstr "已呼叫 create_credential()"
 
-#: quantum/plugins/cisco/network_plugin.py:345
+#: neutron/plugins/cisco/network_plugin.py:345
 msgid "delete_credential() called"
 msgstr "已呼叫 delete_credential()"
 
-#: quantum/plugins/cisco/network_plugin.py:356
+#: neutron/plugins/cisco/network_plugin.py:356
 msgid "rename_credential() called"
 msgstr "已呼叫 rename_credential()"
 
-#: quantum/plugins/cisco/network_plugin.py:367
+#: neutron/plugins/cisco/network_plugin.py:367
 msgid "schedule_host() called"
 msgstr "已呼叫 schedule_host()"
 
-#: quantum/plugins/cisco/network_plugin.py:379
+#: neutron/plugins/cisco/network_plugin.py:379
 msgid "associate_port() called"
 msgstr "已呼叫 associate_port()"
 
-#: quantum/plugins/cisco/network_plugin.py:386
+#: neutron/plugins/cisco/network_plugin.py:386
 msgid "detach_port() called"
 msgstr "已呼叫 detach_port()"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:27
+#: neutron/plugins/cisco/common/cisco_exceptions.py:27
 #, python-format
 msgid "Segmentation ID for network %(net_id)s is not found."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:32
+#: neutron/plugins/cisco/common/cisco_exceptions.py:32
 msgid ""
 "Unable to complete operation. No more dynamic nics are available in the "
 "system."
 msgstr "無法完成作業。系統中沒有更多的可用動態 NIC。"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:38
+#: neutron/plugins/cisco/common/cisco_exceptions.py:38
 #, python-format
 msgid ""
 "NetworkVlanBinding for %(vlan_id)s and network %(network_id)s already "
 "exists"
 msgstr "%(vlan_id)s 及網路 %(network_id)s 的 NetworkVlanBinding 已存在"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:44
+#: neutron/plugins/cisco/common/cisco_exceptions.py:44
 #, python-format
 msgid "Vlan ID %(vlan_id)s not found"
 msgstr "找不到 VLAN ID %(vlan_id)s"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:49
+#: neutron/plugins/cisco/common/cisco_exceptions.py:49
 msgid "No Vlan ID available"
 msgstr "沒有可用的 VLAN ID"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:54
+#: neutron/plugins/cisco/common/cisco_exceptions.py:54
 #, python-format
 msgid "QoS level %(qos_id)s could not be found for tenant %(tenant_id)s"
 msgstr "找不到 Tenant %(tenant_id)s 的服務品質層次 %(qos_id)s"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:60
+#: neutron/plugins/cisco/common/cisco_exceptions.py:60
 #, python-format
 msgid "QoS level with name %(qos_name)s already exists for tenant %(tenant_id)s"
 msgstr "Tenant %(tenant_id)s 已存在名稱為 %(qos_name)s 的服務品質層次"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:66
+#: neutron/plugins/cisco/common/cisco_exceptions.py:66
 #, python-format
 msgid "Credential %(credential_id)s could not be found for tenant %(tenant_id)s"
 msgstr "找不到 Tenant %(tenant_id)s 的認證 %(credential_id)s"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:72
+#: neutron/plugins/cisco/common/cisco_exceptions.py:72
 #, python-format
 msgid "Credential %(credential_name)s could not be found for tenant %(tenant_id)s"
 msgstr "找不到 Tenant %(tenant_id)s 的認證 %(credential_name)s"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:78
+#: neutron/plugins/cisco/common/cisco_exceptions.py:78
 #, python-format
 msgid "Credential %(credential_id)s already exists for tenant %(tenant_id)s"
 msgstr "Tenant %(tenant_id)s 的認證 %(credential_id)s 已存在"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:84
+#: neutron/plugins/cisco/common/cisco_exceptions.py:84
 #, python-format
 msgid "Connection to %(host)s is not configured."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:89
+#: neutron/plugins/cisco/common/cisco_exceptions.py:89
 #, python-format
 msgid "Unable to connect to Nexus %(nexus_host)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:94
+#: neutron/plugins/cisco/common/cisco_exceptions.py:94
 #, python-format
 msgid "Failed to configure Nexus: %(config)s. Reason: %(exc)s."
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:99
+#: neutron/plugins/cisco/common/cisco_exceptions.py:99
 #, python-format
 msgid "Nexus Port Binding (%(filters)s) is not present"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:108
+#: neutron/plugins/cisco/common/cisco_exceptions.py:108
 msgid "No usable Nexus switch found to create SVI interface"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:113
+#: neutron/plugins/cisco/common/cisco_exceptions.py:113
 #, python-format
 msgid "PortVnic Binding %(port_id)s already exists"
 msgstr "「PortVnic 連結」%(port_id)s 已存在"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:118
+#: neutron/plugins/cisco/common/cisco_exceptions.py:118
 #, python-format
 msgid "PortVnic Binding %(port_id)s is not present"
 msgstr "「PortVnic 連結」%(port_id)s 不存在"
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:123
+#: neutron/plugins/cisco/common/cisco_exceptions.py:123
 msgid "No subnet_id specified for router gateway"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:128
+#: neutron/plugins/cisco/common/cisco_exceptions.py:128
 #, python-format
 msgid "Subnet %(subnet_id)s has an interface on %(router_id)s"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_exceptions.py:133
+#: neutron/plugins/cisco/common/cisco_exceptions.py:133
 msgid "Nexus hardware router gateway only uses Subnet Ids"
 msgstr ""
 
-#: quantum/plugins/cisco/common/cisco_faults.py:74
+#: neutron/plugins/cisco/common/cisco_faults.py:74
 msgid "Port not Found"
 msgstr "找不到埠"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:75
+#: neutron/plugins/cisco/common/cisco_faults.py:75
 msgid "Unable to find a port with the specified identifier."
 msgstr "找不到具有所指定 ID 的埠。"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:89
+#: neutron/plugins/cisco/common/cisco_faults.py:89
 msgid "Credential Not Found"
 msgstr "找不到認證"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:90
+#: neutron/plugins/cisco/common/cisco_faults.py:90
 msgid "Unable to find a Credential with the specified identifier."
 msgstr "找不到具有所指定 ID 的認證。"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:105
+#: neutron/plugins/cisco/common/cisco_faults.py:105
 msgid "QoS Not Found"
 msgstr "找不到服務品質"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:106
+#: neutron/plugins/cisco/common/cisco_faults.py:106
 msgid "Unable to find a QoS with the specified identifier."
 msgstr "找不到具有所指定 ID 的服務品質。"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:121
+#: neutron/plugins/cisco/common/cisco_faults.py:121
 msgid "Nova tenant Not Found"
 msgstr "找不到 Nova Tenant"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:122
+#: neutron/plugins/cisco/common/cisco_faults.py:122
 msgid "Unable to find a Novatenant with the specified identifier."
 msgstr "找不到具有所指定 ID 的 Nova Tenant。"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:137
+#: neutron/plugins/cisco/common/cisco_faults.py:137
 msgid "Requested State Invalid"
 msgstr "所要求的狀態無效"
 
-#: quantum/plugins/cisco/common/cisco_faults.py:138
+#: neutron/plugins/cisco/common/cisco_faults.py:138
 msgid "Unable to update port state with specified value."
 msgstr "無法更新具有所指定值的埠狀態。"
 
-#: quantum/plugins/cisco/common/config.py:26
+#: neutron/plugins/cisco/common/config.py:26
 msgid "Virtual Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:30
+#: neutron/plugins/cisco/common/config.py:30
 msgid "Nexus Switch to use"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:36
+#: neutron/plugins/cisco/common/config.py:36
 msgid "VLAN start value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:38
+#: neutron/plugins/cisco/common/config.py:38
 msgid "VLAN end value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:40
+#: neutron/plugins/cisco/common/config.py:40
 msgid "VLAN Name prefix"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:42
+#: neutron/plugins/cisco/common/config.py:42
 msgid "Maximum Port value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:44
+#: neutron/plugins/cisco/common/config.py:44
 msgid "Maximum Port Profile value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:46
+#: neutron/plugins/cisco/common/config.py:46
 msgid "Maximum Network value"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:48
+#: neutron/plugins/cisco/common/config.py:48
 msgid "Distribute SVI interfaces over all switches"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:52
+#: neutron/plugins/cisco/common/config.py:52
 msgid "Model Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:56
+#: neutron/plugins/cisco/common/config.py:56
 msgid "Manager Class"
 msgstr ""
 
-#: quantum/plugins/cisco/common/config.py:60
+#: neutron/plugins/cisco/common/config.py:60
 msgid "Nexus Driver Name"
 msgstr ""
 
-#: quantum/plugins/cisco/db/l2network_db.py:39
-#: quantum/plugins/cisco/db/network_db_v2.py:36
+#: neutron/plugins/cisco/db/l2network_db.py:39
+#: neutron/plugins/cisco/db/network_db_v2.py:35
 msgid "create_vlanids() called"
 msgstr "已呼叫 create_vlanids()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:58
-#: quantum/plugins/cisco/db/l2network_db.py:126
-#: quantum/plugins/cisco/db/network_db_v2.py:55
-#: quantum/plugins/cisco/db/network_db_v2.py:123
+#: neutron/plugins/cisco/db/l2network_db.py:58
+#: neutron/plugins/cisco/db/l2network_db.py:126
+#: neutron/plugins/cisco/db/network_db_v2.py:54
+#: neutron/plugins/cisco/db/network_db_v2.py:122
 msgid "get_all_vlanids() called"
 msgstr "已呼叫 get_all_vlanids()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:65
-#: quantum/plugins/cisco/db/network_db_v2.py:62
+#: neutron/plugins/cisco/db/l2network_db.py:65
+#: neutron/plugins/cisco/db/network_db_v2.py:61
 msgid "is_vlanid_used() called"
 msgstr "已呼叫 is_vlanid_used()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:77
-#: quantum/plugins/cisco/db/network_db_v2.py:74
+#: neutron/plugins/cisco/db/l2network_db.py:77
+#: neutron/plugins/cisco/db/network_db_v2.py:73
 msgid "release_vlanid() called"
 msgstr "已呼叫 release_vlanid()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:93
-#: quantum/plugins/cisco/db/network_db_v2.py:90
+#: neutron/plugins/cisco/db/l2network_db.py:93
+#: neutron/plugins/cisco/db/network_db_v2.py:89
 msgid "delete_vlanid() called"
 msgstr "已呼叫 delete_vlanid()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:107
-#: quantum/plugins/cisco/db/network_db_v2.py:104
+#: neutron/plugins/cisco/db/l2network_db.py:107
+#: neutron/plugins/cisco/db/network_db_v2.py:103
 msgid "reserve_vlanid() called"
 msgstr "已呼叫 reserve_vlanid()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:134
-#: quantum/plugins/cisco/db/network_db_v2.py:131
+#: neutron/plugins/cisco/db/l2network_db.py:134
 msgid "get_all_vlan_bindings() called"
 msgstr "已呼叫 get_all_vlan_bindings()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:141
-#: quantum/plugins/cisco/db/network_db_v2.py:138
+#: neutron/plugins/cisco/db/l2network_db.py:141
 msgid "get_vlan_binding() called"
 msgstr "已呼叫 get_vlan_binding()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:153
-#: quantum/plugins/cisco/db/network_db_v2.py:150
+#: neutron/plugins/cisco/db/l2network_db.py:153
 msgid "add_vlan_binding() called"
 msgstr "已呼叫 add_vlan_binding()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:169
-#: quantum/plugins/cisco/db/network_db_v2.py:166
+#: neutron/plugins/cisco/db/l2network_db.py:169
 msgid "remove_vlan_binding() called"
 msgstr "已呼叫 remove_vlan_binding()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:183
-#: quantum/plugins/cisco/db/network_db_v2.py:180
+#: neutron/plugins/cisco/db/l2network_db.py:183
 msgid "update_vlan_binding() called"
 msgstr "已呼叫 update_vlan_binding()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:209
-#: quantum/plugins/cisco/db/network_db_v2.py:206
+#: neutron/plugins/cisco/db/l2network_db.py:209
+#: neutron/plugins/cisco/db/network_db_v2.py:138
 msgid "get_qos() called"
 msgstr "已呼叫 get_qos()"
 
-#: quantum/plugins/cisco/db/l2network_db.py:223
-#: quantum/plugins/cisco/db/network_db_v2.py:220
+#: neutron/plugins/cisco/db/l2network_db.py:223
+#: neutron/plugins/cisco/db/network_db_v2.py:152
 msgid "add_qos() called"
 msgstr "已呼叫 add_qos()"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:34
+#: neutron/plugins/cisco/db/nexus_db_v2.py:34
 msgid "get_all_nexusport_bindings() called"
 msgstr "已呼叫 get_all_nexusport_bindings()"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:41
+#: neutron/plugins/cisco/db/nexus_db_v2.py:41
 msgid "get_nexusport_binding() called"
 msgstr "已呼叫 get_nexusport_binding()"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:56
+#: neutron/plugins/cisco/db/nexus_db_v2.py:56
 msgid "get_nexusvlan_binding() called"
 msgstr "已呼叫 get_nexusvlan_binding()"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:70
+#: neutron/plugins/cisco/db/nexus_db_v2.py:70
 msgid "add_nexusport_binding() called"
 msgstr "已呼叫 add_nexusport_binding()"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:81
+#: neutron/plugins/cisco/db/nexus_db_v2.py:81
 msgid "remove_nexusport_binding() called"
 msgstr "已呼叫 remove_nexusport_binding()"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:96
+#: neutron/plugins/cisco/db/nexus_db_v2.py:96
 msgid "update_nexusport_binding called"
 msgstr "已呼叫 update_nexusport_binding"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:112
+#: neutron/plugins/cisco/db/nexus_db_v2.py:112
 msgid "get_nexusvm_binding() called"
 msgstr "已呼叫 get_nexusvm_binding()"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:126
+#: neutron/plugins/cisco/db/nexus_db_v2.py:126
 msgid "get_port_vlan_switch_binding() called"
 msgstr "已呼叫 get_port_vlan_switch_binding()"
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:140
+#: neutron/plugins/cisco/db/nexus_db_v2.py:140
 #, python-format
 msgid ""
 "get_port_switch_bindings() called, port:'%(port_id)s', "
 "switch:'%(switch_ip)s'"
 msgstr ""
 
-#: quantum/plugins/cisco/db/nexus_db_v2.py:155
+#: neutron/plugins/cisco/db/nexus_db_v2.py:155
 msgid "get_nexussvi_bindings() called"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:73
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:73
 #, python-format
 msgid "Loaded device plugin %s\n"
 msgstr "已載入裝置外掛程式 %s\n"
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:91
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:91
 #, python-format
 msgid "%(module)s.%(name)s init done"
 msgstr "已完成 %(module)s.%(name)s 起始設定"
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:131
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:131
 #, python-format
 msgid "No %s Plugin loaded"
 msgstr "未載入 %s 外掛程式"
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:132
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:132
 #, python-format
 msgid "%(plugin_key)s: %(function_name)s with args %(args)s ignored"
 msgstr "%(plugin_key)s：已忽略帶有引數 %(args)s 的 %(function_name)s"
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:349
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:349
 #, python-format
 msgid "Unable to update port '%s' on Nexus switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:403
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:403
 msgid "Nexus plugin loaded, creating SVI on switch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:424
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:451
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:424
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:451
 msgid "No Nexus plugin, sending to vswitch"
 msgstr ""
 
-#: quantum/plugins/cisco/models/virt_phy_sw_v2.py:439
+#: neutron/plugins/cisco/models/virt_phy_sw_v2.py:439
 msgid "Nexus plugin loaded, deleting SVI from switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:131
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:138
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:155
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:166
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:240
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:250
 #, python-format
 msgid "NexusDriver: %s"
 msgstr "NexusDriver：%s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
+#: neutron/plugins/cisco/nexus/cisco_nexus_network_driver_v2.py:182
 #, python-format
 msgid "NexusDriver VLAN IDs: %s"
 msgstr "NexusDriver VLAN ID：%s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:51
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:50
 #, python-format
 msgid "Loaded driver %s"
 msgstr "已載入驅動程式 %s"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:71
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:70
 msgid "NexusPlugin:get_all_networks() called"
 msgstr "已呼叫 NexusPlugin:get_all_networks()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:81
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:80
 msgid "NexusPlugin:create_network() called"
 msgstr "已呼叫 NexusPlugin:create_network()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:209
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:208
 msgid "Grabbing a switch to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:211
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:210
 msgid "Using round robin to create SVI"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:230
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:229
 msgid "No round robin or zero weights, using first switch"
 msgstr ""
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:241
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:240
 msgid "NexusPlugin:delete_network() called"
 msgstr "已呼叫 NexusPlugin:delete_network()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:245
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:244
 msgid "NexusPlugin:get_network_details() called"
 msgstr "已呼叫 NexusPlugin:get_network_details()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:251
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:250
 msgid "NexusPlugin:update_network() called"
 msgstr "已呼叫 NexusPlugin:update_network()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:259
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:258
 msgid "NexusPlugin:get_all_ports() called"
 msgstr "已呼叫 NexusPlugin:get_all_ports()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:267
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:266
 msgid "NexusPlugin:create_port() called"
 msgstr "已呼叫 NexusPlugin:create_port()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:275
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:274
 msgid "NexusPlugin:delete_port() called"
 msgstr "已呼叫 NexusPlugin:delete_port()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:323
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:322
 msgid "NexusPlugin:update_port() called"
 msgstr "已呼叫 NexusPlugin:update_port()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:331
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:330
 msgid "NexusPlugin:get_port_details() called"
 msgstr "已呼叫 NexusPlugin:get_port_details()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:340
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:339
 msgid "NexusPlugin:plug_interface() called"
 msgstr "已呼叫 NexusPlugin:plug_interface()"
 
-#: quantum/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:348
+#: neutron/plugins/cisco/nexus/cisco_nexus_plugin_v2.py:347
 msgid "NexusPlugin:unplug_interface() called"
 msgstr "已呼叫 NexusPlugin:unplug_interface()"
 
-#: quantum/plugins/common/utils.py:31
+#: neutron/plugins/common/utils.py:31
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: quantum/plugins/common/utils.py:35
+#: neutron/plugins/common/utils.py:35
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
-#: quantum/plugins/hyperv/db.py:41
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:117
-#: quantum/plugins/openvswitch/ovs_db_v2.py:135
+#: neutron/plugins/hyperv/db.py:41
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:117
+#: neutron/plugins/openvswitch/ovs_db_v2.py:135
 #, python-format
 msgid ""
 "Reserving vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr "正在保留儲存區中實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s"
 
-#: quantum/plugins/hyperv/db.py:56
+#: neutron/plugins/hyperv/db.py:56
 #, python-format
 msgid "Reserving flat physical network %(physical_network)s from pool"
 msgstr "正在保留儲存區中的平面實體網路 %(physical_network)s"
 
-#: quantum/plugins/hyperv/db.py:79
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:140
-#: quantum/plugins/ml2/drivers/type_vlan.py:206
-#: quantum/plugins/openvswitch/ovs_db_v2.py:159
+#: neutron/plugins/hyperv/db.py:79
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:140
+#: neutron/plugins/ml2/drivers/type_vlan.py:206
+#: neutron/plugins/openvswitch/ovs_db_v2.py:159
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s from pool"
 msgstr "正在保留儲存區中實體網路 %(physical_network)s 上的特定 VLAN %(vlan_id)s"
 
-#: quantum/plugins/hyperv/db.py:136
+#: neutron/plugins/hyperv/db.py:136
 #, python-format
 msgid "Releasing vlan %(vlan_id)s on physical network %(physical_network)s"
 msgstr "正在釋放實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s"
 
-#: quantum/plugins/hyperv/db.py:141
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:181
-#: quantum/plugins/openvswitch/ovs_db_v2.py:200
+#: neutron/plugins/hyperv/db.py:141
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:181
+#: neutron/plugins/openvswitch/ovs_db_v2.py:200
 #, python-format
 msgid "vlan_id %(vlan_id)s on physical network %(physical_network)s not found"
 msgstr "在實體網路 %(physical_network)s 上找不到 vlan_id %(vlan_id)s"
 
-#: quantum/plugins/hyperv/db.py:166 quantum/plugins/hyperv/db.py:179
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:68
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:87
-#: quantum/plugins/ml2/drivers/type_vlan.py:128
-#: quantum/plugins/ml2/drivers/type_vlan.py:149
-#: quantum/plugins/openvswitch/ovs_db_v2.py:91
-#: quantum/plugins/openvswitch/ovs_db_v2.py:109
+#: neutron/plugins/hyperv/db.py:166 neutron/plugins/hyperv/db.py:179
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:68
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:87
+#: neutron/plugins/ml2/drivers/type_vlan.py:128
+#: neutron/plugins/ml2/drivers/type_vlan.py:149
+#: neutron/plugins/openvswitch/ovs_db_v2.py:91
+#: neutron/plugins/openvswitch/ovs_db_v2.py:109
 #, python-format
 msgid ""
 "Removing vlan %(vlan_id)s on physical network %(physical_network)s from "
 "pool"
 msgstr "正在將實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s 從儲存區中移除"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:42
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:42
 msgid "Network type for tenant networks (local, flat, vlan or none)"
 msgstr "Tenant 網路的網路類型（本端、平面、VLAN 或無）"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:46
-#: quantum/plugins/linuxbridge/common/config.py:35
-#: quantum/plugins/mlnx/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:51
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:46
+#: neutron/plugins/linuxbridge/common/config.py:35
+#: neutron/plugins/mlnx/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:51
 msgid "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network>"
 msgstr "<physical_network>:<vlan_min>:<vlan_max> 或 <physical_network> 的清單"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:74
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:96
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:74
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:96
 #, python-format
 msgid "segmentation_id specified for %s network"
 msgstr "指定給 %s 網路的 segmentation_id"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:81
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:81
 #, python-format
 msgid "physical_network specified for %s network"
 msgstr "指定給 %s 網路的 physical_network"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:123
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:123
 msgid "physical_network not provided"
 msgstr "未提供 physical_network"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:172
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:172
 #, python-format
 msgid "Invalid tenant_network_type: %s. Agent terminated!"
 msgstr "無效的 tenant_network_type：%s。已終止代理程式！"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:194
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:273
-#: quantum/plugins/ml2/drivers/type_vlan.py:94
-#: quantum/plugins/mlnx/mlnx_plugin.py:107
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:315
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:194
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:275
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
+#: neutron/plugins/mlnx/mlnx_plugin.py:107
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:317
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "網路 VLAN 範圍：%s"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:219
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:219
 #, python-format
 msgid "Network type %s not supported"
 msgstr "不支援網路類型 %s"
 
-#: quantum/plugins/hyperv/hyperv_quantum_plugin.py:245
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:174
-#: quantum/plugins/mlnx/mlnx_plugin.py:271
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:462
+#: neutron/plugins/hyperv/hyperv_neutron_plugin.py:245
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:174
+#: neutron/plugins/mlnx/mlnx_plugin.py:271
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:464
 #, python-format
 msgid "Created network: %s"
 msgstr "已建立網路：%s"
 
-#: quantum/plugins/hyperv/rpc_callbacks.py:77
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:116
-#: quantum/plugins/mlnx/rpc_callbacks.py:97
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:121
+#: neutron/plugins/hyperv/rpc_callbacks.py:77
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:116
+#: neutron/plugins/mlnx/rpc_callbacks.py:97
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:121
 #, python-format
 msgid "Device %(device)s no longer exists on %(agent_id)s"
 msgstr "裝置 %(device)s 已不再存在於 %(agent_id)s 上"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:44
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:44
 msgid ""
 "List of <physical_network>:<vswitch> where the physical networks can be "
 "expressed with wildcards, e.g.: .\"*:external\""
 msgstr "<physical_network>:<vswitch> 的清單，其中，實體網路可以用萬用字元來表示，例如：.\"*:external\""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:50
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:50
 msgid "Private vswitch name used for local networks"
 msgstr "用於本端網路的專用 vSwitch 名稱"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:52
-#: quantum/plugins/linuxbridge/common/config.py:47
-#: quantum/plugins/mlnx/common/config.py:54
-#: quantum/plugins/nec/common/config.py:32
-#: quantum/plugins/openvswitch/common/config.py:60
-#: quantum/plugins/ryu/common/config.py:45
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:52
+#: neutron/plugins/linuxbridge/common/config.py:47
+#: neutron/plugins/mlnx/common/config.py:54
+#: neutron/plugins/nec/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:60
+#: neutron/plugins/ryu/common/config.py:45
 msgid ""
 "The number of seconds the agent will wait between polling for local "
 "device changes."
 msgstr "輪詢本端裝置變更之間代理程式將等待的秒數。"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:95
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:95
 #, python-format
 msgid "Invalid physical network mapping: %s"
 msgstr "無效的實體網路對映：%s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:116
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:116
 #, python-format
 msgid "network_delete received. Deleting network %s"
 msgstr "收到 network_delete。正在刪除網路 %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:122
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:122
 #, python-format
 msgid "Network %s not defined on agent."
 msgstr "代理程式上未定義網路 %s。"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:125
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:125
 msgid "port_delete received"
 msgstr "收到 port_delete"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:130
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:432
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:168
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:258
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:130
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:432
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:168
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:259
 msgid "port_update received"
 msgstr "收到 port_update"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:151
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:130
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:151
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:130
 #, python-format
 msgid "Provisioning network %s"
 msgstr "正在供應網路 %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:164
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:164
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for network "
 "%(net_uuid)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:176
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:176
 #, python-format
 msgid "Reclaiming local network %s"
 msgstr "正在收回本端網路 %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:184
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:184
 #, python-format
 msgid "Binding port %s"
 msgstr "正在連結埠 %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:197
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:197
 #, python-format
 msgid "Binding VLAN ID %(segmentation_id)s to switch port %(port_id)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:210
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:115
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:210
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:115
 #, python-format
 msgid "Unsupported network type %s"
 msgstr "不支援的網路類型 %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:215
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:215
 #, python-format
 msgid "Network %s is not avalailable on this agent"
 msgstr "在此代理程式上無法使用網路 %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:219
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:219
 #, python-format
 msgid "Unbinding port %s"
 msgstr "正在切斷埠 %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:245
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:187
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:289
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:245
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:187
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:289
 #, python-format
 msgid "No port %s defined on agent."
 msgstr "代理程式上未定義埠 %s。"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:250
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:250
 #, python-format
 msgid "Adding port %s"
 msgstr "正在新增連接埠 %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:257
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:257
 #, python-format
 msgid "Unable to get port details for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:263
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:263
 #, python-format
 msgid "Port %(device)s updated. Details: %(device_details)s"
 msgstr "已更新埠 %(device)s。詳細資料：%(device_details)s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:278
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:278
 #, python-format
 msgid "Removing port %s"
 msgstr "正在移除埠 %s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:285
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:285
 #, python-format
 msgid "Removing port failed for device %(device)s: %(e)s"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:310
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:640
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:352
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:717
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:310
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:640
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:352
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:718
 msgid "Agent out of sync with plugin!"
 msgstr "代理程式與外掛程式不同步！"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:318
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:652
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:359
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:730
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:318
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:652
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:359
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:731
 msgid "Agent loop has new devices!"
 msgstr "代理程式迴圈具有新裝置！"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:323
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:323
 #, python-format
 msgid "Error in agent event loop: %s"
 msgstr "代理程式事件迴圈發生錯誤：%s"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:331
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:371
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:371
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)"
 msgstr "迴圈反覆運算已超出間隔（%(polling_interval)s 與 %(elapsed)s）"
 
-#: quantum/plugins/hyperv/agent/hyperv_quantum_agent.py:345
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:691
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:846
+#: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:345
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:691
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:848
 msgid "Agent initialized successfully, now running... "
 msgstr "已順利地起始設定代理程式，現正在執行中..."
 
-#: quantum/plugins/hyperv/agent/utils.py:38
+#: neutron/plugins/hyperv/agent/utils.py:38
 #, python-format
 msgid "HyperVException: %(msg)s"
 msgstr "HyperVException：%(msg)s"
 
-#: quantum/plugins/hyperv/agent/utils.py:76
+#: neutron/plugins/hyperv/agent/utils.py:76
 #, python-format
 msgid "Vnic not found: %s"
 msgstr "找不到 Vnic：%s"
 
-#: quantum/plugins/hyperv/agent/utils.py:112
+#: neutron/plugins/hyperv/agent/utils.py:112
 #, python-format
 msgid "Job failed with error %d"
 msgstr "工作失敗，發生錯誤 %d"
 
-#: quantum/plugins/hyperv/agent/utils.py:131
+#: neutron/plugins/hyperv/agent/utils.py:131
 #, python-format
 msgid ""
 "WMI job failed with status %(job_state)d. Error details: %(err_sum_desc)s"
@@ -4739,586 +4747,586 @@ msgstr ""
 "WMI 工作失敗，狀態為 %(job_state)d。錯誤詳細資料：%(err_sum_desc)s - %(err_desc)s - "
 "錯誤碼：%(err_code)d"
 
-#: quantum/plugins/hyperv/agent/utils.py:140
+#: neutron/plugins/hyperv/agent/utils.py:140
 #, python-format
 msgid "WMI job failed with status %(job_state)d. Error details: %(error)s"
 msgstr "WMI 工作失敗，狀態為 %(job_state)d。錯誤詳細資料：%(error)s"
 
-#: quantum/plugins/hyperv/agent/utils.py:144
+#: neutron/plugins/hyperv/agent/utils.py:144
 #, python-format
 msgid "WMI job failed with status %d. No error description available"
 msgstr ""
 
-#: quantum/plugins/hyperv/agent/utils.py:149
+#: neutron/plugins/hyperv/agent/utils.py:149
 #, python-format
 msgid "WMI job succeeded: %(desc)s, Elapsed=%(elap)s"
 msgstr "WMI 工作已成功：%(desc)s，歷時 = %(elap)s"
 
-#: quantum/plugins/hyperv/agent/utils.py:163
+#: neutron/plugins/hyperv/agent/utils.py:163
 #, python-format
 msgid "Failed creating port for %s"
 msgstr "給 %s 建立埠時失敗"
 
-#: quantum/plugins/hyperv/agent/utils.py:183
+#: neutron/plugins/hyperv/agent/utils.py:183
 #, python-format
 msgid ""
 "Failed to disconnect port %(switch_port_name)s from switch "
 "%(vswitch_name)s with error %(ret_val)s"
 msgstr "無法切斷埠 %(switch_port_name)s 與交換器 %(vswitch_name)s 的連線，發生錯誤 %(ret_val)s"
 
-#: quantum/plugins/hyperv/agent/utils.py:194
+#: neutron/plugins/hyperv/agent/utils.py:194
 #, python-format
 msgid ""
 "Failed to delete port %(switch_port_name)s from switch %(vswitch_name)s "
 "with error %(ret_val)s"
 msgstr "無法將埠 %(switch_port_name)s 從交換器 %(vswitch_name)s 刪除，發生錯誤 %(ret_val)s"
 
-#: quantum/plugins/hyperv/agent/utils.py:201
+#: neutron/plugins/hyperv/agent/utils.py:201
 #, python-format
 msgid "VSwitch not found: %s"
 msgstr "找不到 vSwitch：%s"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:135
-#: quantum/plugins/mlnx/rpc_callbacks.py:115
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:135
+#: neutron/plugins/mlnx/rpc_callbacks.py:115
 #, python-format
 msgid "Device %(device)s up %(agent_id)s"
 msgstr "裝置 %(device)s 已在 %(agent_id)s 上啟動"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:241
-#: quantum/plugins/mlnx/mlnx_plugin.py:136
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:241
+#: neutron/plugins/mlnx/mlnx_plugin.py:136
 #, python-format
 msgid "Invalid tenant_network_type: %s. Service terminated!"
 msgstr "無效的 tenant_network_type：%s。已終止服務！"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:250
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:252
 msgid "Linux Bridge Plugin initialization complete"
 msgstr "已完成 Linux 橋接器外掛程式起始設定"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:271
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:273
 #, python-format
 msgid "%s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:312
-#: quantum/plugins/mlnx/mlnx_plugin.py:155
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:361
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:314
+#: neutron/plugins/mlnx/mlnx_plugin.py:155
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:363
 msgid "provider:network_type required"
 msgstr "需要 provider:network_type"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:316
-#: quantum/plugins/mlnx/mlnx_plugin.py:180
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:365
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:318
+#: neutron/plugins/mlnx/mlnx_plugin.py:180
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:367
 msgid "provider:segmentation_id specified for flat network"
 msgstr "給平面網路指定了 provider:segmentation_id"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:322
-#: quantum/plugins/mlnx/mlnx_plugin.py:185
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:371
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:390
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:324
+#: neutron/plugins/mlnx/mlnx_plugin.py:185
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:373
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:392
 msgid "provider:segmentation_id required"
 msgstr "需要 provider:segmentation_id"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:325
-#: quantum/plugins/mlnx/mlnx_plugin.py:188
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:374
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:327
+#: neutron/plugins/mlnx/mlnx_plugin.py:188
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:376
 #, python-format
 msgid "provider:segmentation_id out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:332
-#: quantum/plugins/mlnx/mlnx_plugin.py:196
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:394
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:334
+#: neutron/plugins/mlnx/mlnx_plugin.py:196
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:396
 msgid "provider:physical_network specified for local network"
 msgstr "給本端網路指定了 provider:physical_network"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:338
-#: quantum/plugins/mlnx/mlnx_plugin.py:200
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:400
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:340
+#: neutron/plugins/mlnx/mlnx_plugin.py:200
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:402
 msgid "provider:segmentation_id specified for local network"
 msgstr "給本端網路指定了 provider:segmentation_id"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:344
-#: quantum/plugins/mlnx/mlnx_plugin.py:171
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:406
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:346
+#: neutron/plugins/mlnx/mlnx_plugin.py:171
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:408
 #, python-format
 msgid "provider:network_type %s not supported"
 msgstr "不支援 provider:network_type %s"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:350
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:412
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:352
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:414
 #, python-format
 msgid "Unknown provider:physical_network %s"
 msgstr "不明的 provider:physical_network %s"
 
-#: quantum/plugins/linuxbridge/lb_quantum_plugin.py:356
-#: quantum/plugins/mlnx/mlnx_plugin.py:218
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:418
+#: neutron/plugins/linuxbridge/lb_neutron_plugin.py:358
+#: neutron/plugins/mlnx/mlnx_plugin.py:218
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:420
 msgid "provider:physical_network required"
 msgstr "需要 provider:physical_network"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:89
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:89
 msgid "Invalid Network ID, will lead to incorrect bridgename"
 msgstr "無效的網路 ID 將導致橋接器名稱不正確"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:96
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:96
 msgid "Invalid VLAN ID, will lead to incorrect subinterface name"
 msgstr "無效的 VLAN ID 將導致子介面名稱不正確"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:103
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:103
 msgid "Invalid Interface ID, will lead to incorrect tap device name"
 msgstr "無效的介面 ID 將導致虛擬網卡裝置名稱不正確"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:171
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:171
 #, python-format
 msgid ""
 "Creating subinterface %(interface)s for VLAN %(vlan_id)s on interface "
 "%(physical_interface)s"
 msgstr "正在給介面 %(physical_interface)s 上的 VLAN %(vlan_id)s 建立子介面 %(interface)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:184
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:184
 #, python-format
 msgid "Done creating subinterface %s"
 msgstr "已完成建立子介面 %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:219
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:219
 #, python-format
 msgid "Starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr "正在啟動子介面 %(interface)s 的橋接器 %(bridge_name)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:234
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:234
 #, python-format
 msgid "Done starting bridge %(bridge_name)s for subinterface %(interface)s"
 msgstr "已完成啟動子介面 %(interface)s 的橋接器 %(bridge_name)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:250
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:250
 #, python-format
 msgid "Unable to add %(interface)s to %(bridge_name)s! Exception: %(e)s"
 msgstr "無法將 %(interface)s 新增至 %(bridge_name)s！異常狀況：%(e)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:263
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:263
 #, python-format
 msgid "No mapping for physical network %s"
 msgstr "實體網路 %s 沒有對映"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:272
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:272
 #, python-format
 msgid "Unknown network_type %(network_type)s for network %(network_id)s."
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:284
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:284
 #, python-format
 msgid "Tap device: %s does not exist on this host, skipped"
 msgstr "虛擬網卡裝置 %s 不存在於此主機上，已跳過"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:302
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:302
 #, python-format
 msgid "Adding device %(tap_device_name)s to bridge %(bridge_name)s"
 msgstr "正在將裝置 %(tap_device_name)s 新增至橋接器 %(bridge_name)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:311
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:311
 #, python-format
 msgid "%(tap_device_name)s already exists on bridge %(bridge_name)s"
 msgstr "%(tap_device_name)s 已存在於橋接器 %(bridge_name)s 上"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:340
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:340
 #, python-format
 msgid "Deleting bridge %s"
 msgstr "正在刪除橋接器 %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:347
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:347
 #, python-format
 msgid "Done deleting bridge %s"
 msgstr "已完成刪除橋接器 %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:350
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:350
 #, python-format
 msgid "Cannot delete bridge %s, does not exist"
 msgstr "無法刪除橋接器 %s，不存在"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:357
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:357
 #, python-format
 msgid "Removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr "正在將裝置 %(interface_name)s 從橋接器 %(bridge_name)s 中移除"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:364
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:364
 #, python-format
 msgid "Done removing device %(interface_name)s from bridge %(bridge_name)s"
 msgstr "已完成將裝置 %(interface_name)s 從橋接器 %(bridge_name)s 中移除"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:370
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:370
 #, python-format
 msgid ""
 "Cannot remove device %(interface_name)s bridge %(bridge_name)s does not "
 "exist"
 msgstr "無法將裝置 %(interface_name)s 從橋接器 %(bridge_name)s 中移除，該裝置不存在"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:378
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:378
 #, python-format
 msgid "Deleting subinterface %s for vlan"
 msgstr "正在刪除 VLAN 的子介面 %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:385
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:385
 #, python-format
 msgid "Done deleting subinterface %s"
 msgstr "已完成刪除子介面 %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:425
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:159
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:247
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:425
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:159
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:248
 msgid "network_delete received"
 msgstr "收到 network_delete"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:473
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:283
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:473
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:284
 #, python-format
 msgid "RPC timeout while updating port %s"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:525
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:525
 msgid "Unable to obtain MAC address for unique ID. Agent terminated!"
 msgstr "無法取得唯一 ID 的 MAC 位址。已終止代理程式！"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:529
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:145
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:529
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:145
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr "RPC agent_id：%s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:575
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:632
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:575
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:633
 #, python-format
 msgid "Port %s added"
 msgstr "已新增埠 %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:581
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:638
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:581
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:639
 #, python-format
 msgid "Unable to get port details for %(device)s: %(e)s"
 msgstr "無法取得 %(device)s 的埠詳細資料：%(e)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:587
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:645
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:587
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:646
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr "已更新埠 %(device)s。詳細資料：%(details)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:608
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:628
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:339
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:654
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:677
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:608
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:628
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:339
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:655
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:678
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr "外掛程式上未定義裝置 %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:615
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:663
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:615
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:664
 #, python-format
 msgid "Attachment %s removed"
 msgstr "已移除連接裝置 %s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:621
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:669
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:621
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:670
 #, python-format
 msgid "port_removed failed for %(device)s: %(e)s"
 msgstr "對 %(device)s 執行 port_removed 作業失敗：%(e)s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:625
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:336
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:674
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:625
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:336
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:675
 #, python-format
 msgid "Port %s updated."
 msgstr "已更新埠 %s。"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:635
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:635
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr "已啟動「LinuxBridge 代理程式 RPC 常駐程式」！"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:647
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:647
 msgid "Update devices failed"
 msgstr "更新裝置失敗"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:658
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:658
 #, python-format
 msgid "Error in agent loop. Devices info: %s"
 msgstr "代理程式迴圈發生錯誤。裝置資訊：%s"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:666
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:745
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:269
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:666
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:746
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:269
 #, python-format
 msgid "Loop iteration exceeded interval (%(polling_interval)s vs. %(elapsed)s)!"
 msgstr "迴圈反覆運算已超出間隔（%(polling_interval)s 與 %(elapsed)s）！"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:681
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:386
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:681
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:386
 #, python-format
 msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr "剖析 physical_interface_mappings 失敗：%s。已終止代理程式！"
 
-#: quantum/plugins/linuxbridge/agent/linuxbridge_quantum_agent.py:684
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:389
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:684
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:389
 #, python-format
 msgid "Interface mappings: %s"
 msgstr "介面對映：%s"
 
-#: quantum/plugins/linuxbridge/common/config.py:31
+#: neutron/plugins/linuxbridge/common/config.py:31
 msgid "Network type for tenant networks (local, vlan, or none)"
 msgstr "Tenant 網路的網路類型（本端、VLAN 或無）"
 
-#: quantum/plugins/linuxbridge/common/config.py:42
-#: quantum/plugins/mlnx/common/config.py:40
+#: neutron/plugins/linuxbridge/common/config.py:42
+#: neutron/plugins/mlnx/common/config.py:40
 msgid "List of <physical_network>:<physical_interface>"
 msgstr "<physical_network>:<physical_interface> 的清單"
 
-#: quantum/plugins/linuxbridge/common/config.py:51
+#: neutron/plugins/linuxbridge/common/config.py:51
 msgid "Enable server RPC compatibility with old agents"
 msgstr ""
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:146
-#: quantum/plugins/ml2/drivers/type_vlan.py:212
-#: quantum/plugins/openvswitch/ovs_db_v2.py:165
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:146
+#: neutron/plugins/ml2/drivers/type_vlan.py:212
+#: neutron/plugins/openvswitch/ovs_db_v2.py:165
 #, python-format
 msgid ""
 "Reserving specific vlan %(vlan_id)s on physical network "
 "%(physical_network)s outside pool"
 msgstr "正在保留儲存區外部實體網路 %(physical_network)s 上的特定 VLAN %(vlan_id)s"
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:170
-#: quantum/plugins/ml2/drivers/type_vlan.py:261
-#: quantum/plugins/openvswitch/ovs_db_v2.py:195
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:170
+#: neutron/plugins/ml2/drivers/type_vlan.py:261
+#: neutron/plugins/openvswitch/ovs_db_v2.py:195
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s to "
 "pool"
 msgstr "正在將實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s 釋放到儲存區"
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:175
-#: quantum/plugins/ml2/drivers/type_vlan.py:256
-#: quantum/plugins/openvswitch/ovs_db_v2.py:190
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:256
+#: neutron/plugins/openvswitch/ovs_db_v2.py:190
 #, python-format
 msgid ""
 "Releasing vlan %(vlan_id)s on physical network %(physical_network)s "
 "outside pool"
 msgstr "正在釋放儲存區外部實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s"
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:206
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:215
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:206
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:215
 msgid "get_port_from_device() called"
 msgstr "已呼叫 get_port_from_device()"
 
-#: quantum/plugins/linuxbridge/db/l2network_db_v2.py:234
+#: neutron/plugins/linuxbridge/db/l2network_db_v2.py:234
 #, python-format
 msgid "set_port_status as %s called"
 msgstr "已呼叫 set_port_status 作為 %s"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:40
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:40
 #, python-format
 msgid "Flavor %(flavor)s could not be found"
 msgstr "找不到特性 %(flavor)s"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:44
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:44
 msgid "Failed to add flavor binding"
 msgstr "無法新增特性連結"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:51
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:51
 msgid "Start initializing metaplugin"
 msgstr "開始起始設定 meta 外掛程式"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:93
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:93
 #, python-format
 msgid "default_flavor %s is not plugin list"
 msgstr "default_flavor %s 不是外掛程式清單"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:98
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:98
 #, python-format
 msgid "default_l3_flavor %s is not plugin list"
 msgstr "default_l3_flavor %s 不是外掛程式清單"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:164
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:164
 #, python-format
 msgid "Created network: %(net_id)s with flavor %(flavor)s"
 msgstr "已建立特性為 %(flavor)s 的網路：%(net_id)s"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:170
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:170
 msgid "Failed to add flavor bindings"
 msgstr "無法新增特性連結"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:291
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:291
 #, python-format
 msgid "Created router: %(router_id)s with flavor %(flavor)s"
 msgstr "已建立特性為 %(flavor)s 的路由器：%(router_id)s"
 
-#: quantum/plugins/metaplugin/meta_quantum_plugin.py:297
+#: neutron/plugins/metaplugin/meta_neutron_plugin.py:297
 #, python-format
 msgid "Created router: %s"
 msgstr "已建立路由器：%s"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:67
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:67
 #, python-format
 msgid "Update subnet failed: %s"
 msgstr "更新子網路失敗：%s"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:74
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:74
 msgid "Subnet in remote have already deleted"
 msgstr "已刪除遠端的子網路"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:95
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:95
 #, python-format
 msgid "Update network failed: %s"
 msgstr "更新網路失敗：%s"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:102
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:102
 msgid "Network in remote have already deleted"
 msgstr "已刪除遠端的網路"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:123
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:123
 #, python-format
 msgid "Update port failed: %s"
 msgstr "更新埠失敗：%s"
 
-#: quantum/plugins/metaplugin/proxy_quantum_plugin.py:134
+#: neutron/plugins/metaplugin/proxy_neutron_plugin.py:134
 msgid "Port in remote have already deleted"
 msgstr "已刪除遠端的埠"
 
-#: quantum/plugins/metaplugin/common/config.py:23
+#: neutron/plugins/metaplugin/common/config.py:23
 msgid "List of plugins to load"
 msgstr "要載入的外掛程式清單"
 
-#: quantum/plugins/metaplugin/common/config.py:25
+#: neutron/plugins/metaplugin/common/config.py:25
 msgid "List of L3 plugins to load"
 msgstr "要載入的 L3 外掛程式清單"
 
-#: quantum/plugins/metaplugin/common/config.py:27
+#: neutron/plugins/metaplugin/common/config.py:27
 msgid "Default flavor to use"
 msgstr "要使用的預設特性"
 
-#: quantum/plugins/metaplugin/common/config.py:29
+#: neutron/plugins/metaplugin/common/config.py:29
 msgid "Default L3 flavor to use"
 msgstr "要使用的預設 L3 特性"
 
-#: quantum/plugins/metaplugin/common/config.py:31
+#: neutron/plugins/metaplugin/common/config.py:31
 msgid "Supported extension aliases"
 msgstr "支援的延伸別名"
 
-#: quantum/plugins/metaplugin/common/config.py:33
+#: neutron/plugins/metaplugin/common/config.py:33
 msgid "A list of extensions, per plugin, to load."
 msgstr "要給每個外掛程式載入的延伸清單。"
 
-#: quantum/plugins/midonet/config.py:25
+#: neutron/plugins/midonet/config.py:25
 msgid "MidoNet API server URI."
 msgstr "MidoNet API 伺服器 URI。"
 
-#: quantum/plugins/midonet/config.py:27
+#: neutron/plugins/midonet/config.py:27
 msgid "MidoNet admin username."
 msgstr "MidoNet 管理者使用者名稱。"
 
-#: quantum/plugins/midonet/config.py:30
+#: neutron/plugins/midonet/config.py:30
 msgid "MidoNet admin password."
 msgstr "MidoNet 管理者密碼。"
 
-#: quantum/plugins/midonet/config.py:33
+#: neutron/plugins/midonet/config.py:33
 msgid "ID of the project that MidoNet admin userbelongs to."
 msgstr "MidoNet 管理者使用者所屬的專案 ID。"
 
-#: quantum/plugins/midonet/config.py:37
+#: neutron/plugins/midonet/config.py:37
 msgid "Virtual provider router ID."
 msgstr "虛擬提供者路由器 ID。"
 
-#: quantum/plugins/midonet/config.py:40
+#: neutron/plugins/midonet/config.py:40
 msgid "Virtual metadata router ID."
 msgstr "虛擬 meta 資料路由器 ID。"
 
-#: quantum/plugins/midonet/config.py:43
+#: neutron/plugins/midonet/config.py:43
 msgid "Operational mode. Internal dev use only."
 msgstr "作業模式。僅限內部開發使用。"
 
-#: quantum/plugins/midonet/midonet_lib.py:79
+#: neutron/plugins/midonet/midonet_lib.py:79
 #, python-format
 msgid "MidoNet %(resource_type)s %(id)s could not be found"
 msgstr "找不到 MidoNet %(resource_type)s %(id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:83
+#: neutron/plugins/midonet/midonet_lib.py:83
 #, python-format
 msgid "MidoNet API error: %(msg)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:99
+#: neutron/plugins/midonet/midonet_lib.py:99
 #, fuzzy, python-format
 msgid "MidoClient.create_bridge called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 "已呼叫 ChainManager.create_for_sg：tenant_id = %(tenant_id)s sg_id = "
 "%(sg_id)s sg_name = %(sg_name)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:111
+#: neutron/plugins/midonet/midonet_lib.py:111
 #, fuzzy, python-format
 msgid "MidoClient.delete_bridge called: id=%(id)s"
 msgstr "已呼叫 MidonetPluginV2.delete_subnet：ID = %s"
 
-#: quantum/plugins/midonet/midonet_lib.py:121
+#: neutron/plugins/midonet/midonet_lib.py:121
 #, python-format
 msgid "MidoClient.get_bridge called: id=%s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:135
+#: neutron/plugins/midonet/midonet_lib.py:135
 #, fuzzy, python-format
 msgid "MidoClient.update_bridge called: id=%(id)s, name=%(name)s"
 msgstr "已呼叫 MidonetPluginV2.update_router：ID = %(id)s 路由器 = %(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:152
+#: neutron/plugins/midonet/midonet_lib.py:152
 #, python-format
 msgid ""
 "MidoClient.create_dhcp called: bridge=%s(bridge)s, net_addr=%(net_addr)s,"
 " net_len=%(net_len)s, gateway_ip=%(gateway_ip)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:169
+#: neutron/plugins/midonet/midonet_lib.py:169
 #, python-format
 msgid ""
 "MidoClient.create_dhcp_hosts called: bridge=%s(bridge), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:186
+#: neutron/plugins/midonet/midonet_lib.py:186
 #, python-format
 msgid ""
 "MidoClient.delete_dhcp_hosts called: bridge_id=%s(bridge_id), ip=%(ip)s, "
 "mac=%(mac)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:202
+#: neutron/plugins/midonet/midonet_lib.py:202
 #, python-format
 msgid "MidoClient.delete_dhcp called: bridge=%s(bridge), "
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:215
+#: neutron/plugins/midonet/midonet_lib.py:215
 #, fuzzy, python-format
 msgid "MidoClient.delete_port called: id=%(id)s"
 msgstr "已呼叫 MidonetPluginV2.delete_router：ID = %s"
 
-#: quantum/plugins/midonet/midonet_lib.py:225
+#: neutron/plugins/midonet/midonet_lib.py:225
 #, fuzzy, python-format
 msgid "MidoClient.get_port called: id=%(id)s"
 msgstr "已呼叫 MidonetPluginV2.get_port：ID = %(id)s 欄位 = %(fields)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:238
+#: neutron/plugins/midonet/midonet_lib.py:238
 #, python-format
 msgid "MidoClient.create_exterior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:249
+#: neutron/plugins/midonet/midonet_lib.py:249
 #, python-format
 msgid "MidoClient.create_interior_bridge_port called: bridge=%(bridge)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:261
+#: neutron/plugins/midonet/midonet_lib.py:261
 #, fuzzy, python-format
 msgid "MidoClient.create_router called: tenant_id=%(tenant_id)s, name=%(name)s"
 msgstr ""
 "已呼叫 ChainManager.create_router_chains：tenant_id = %(tenant_id)s router_id"
 " = %(router_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:276
+#: neutron/plugins/midonet/midonet_lib.py:276
 #, fuzzy, python-format
 msgid ""
 "MidoClient.create_tenant_router called: tenant_id=%(tenant_id)s, "
@@ -5327,29 +5335,29 @@ msgstr ""
 "已呼叫 ChainManager.create_router_chains：tenant_id = %(tenant_id)s router_id"
 " = %(router_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:292
+#: neutron/plugins/midonet/midonet_lib.py:292
 #, fuzzy, python-format
 msgid ""
 "MidoClient.delete_tenant_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr "已呼叫 MidonetPluginV2.update_router：ID = %(id)s 路由器 = %(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:307
+#: neutron/plugins/midonet/midonet_lib.py:307
 #, fuzzy, python-format
 msgid "MidoClient.delete_router called: id=%(id)s"
 msgstr "已呼叫 MidonetPluginV2.delete_router：ID = %s"
 
-#: quantum/plugins/midonet/midonet_lib.py:317
+#: neutron/plugins/midonet/midonet_lib.py:317
 #, fuzzy, python-format
 msgid "MidoClient.get_router called: id=%(id)s"
 msgstr "已呼叫 MidonetPluginV2.get_router：ID = %(id)s 欄位 = %(fields)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:331
+#: neutron/plugins/midonet/midonet_lib.py:331
 #, fuzzy, python-format
 msgid "MidoClient.update_router called: id=%(id)s, name=%(name)s"
 msgstr "已呼叫 MidonetPluginV2.update_router：ID = %(id)s 路由器 = %(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:350
+#: neutron/plugins/midonet/midonet_lib.py:350
 #, python-format
 msgid ""
 "MidoClient.link_bridge_port_to_router called: port_id=%(port_id)s, "
@@ -5357,12 +5365,12 @@ msgid ""
 " net_len=%(net_len)s, metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:382
+#: neutron/plugins/midonet/midonet_lib.py:382
 #, python-format
 msgid "Couldn't find a md router port for the router=%r"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:399
+#: neutron/plugins/midonet/midonet_lib.py:399
 #, python-format
 msgid ""
 "MidoClient.unlink_bridge_port_from_router called: port_id=%(port_id)s, "
@@ -5370,12 +5378,12 @@ msgid ""
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:414
+#: neutron/plugins/midonet/midonet_lib.py:414
 #, python-format
 msgid "Deleting route=%r ..."
 msgstr "正在刪除路徑 = %r..."
 
-#: quantum/plugins/midonet/midonet_lib.py:429
+#: neutron/plugins/midonet/midonet_lib.py:429
 #, python-format
 msgid ""
 "MidoClient.link_bridge_to_provider_router called: bridge=%(bridge)s, "
@@ -5383,26 +5391,26 @@ msgid ""
 "net_addr=%(net_addr)s, net_len=%(net_len)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:458
+#: neutron/plugins/midonet/midonet_lib.py:458
 #, fuzzy, python-format
 msgid ""
 "MidoClient.unlink_bridge_from_provider_router called: bridge=%(bridge)s, "
 "provider_router=%(provider_router)s"
 msgstr "已呼叫 MidonetPluginV2.update_router：ID = %(id)s 路由器 = %(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:489
+#: neutron/plugins/midonet/midonet_lib.py:489
 #, python-format
 msgid ""
 "MidoClient.set_router_external_gateway called: id=%(id)s, "
 "provider_router=%(provider_router)s, snat_ip=%s(snat_ip)s)"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:548
+#: neutron/plugins/midonet/midonet_lib.py:548
 #, python-format
 msgid "MidoClient.clear_router_external_gateway called: id=%(id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:591
+#: neutron/plugins/midonet/midonet_lib.py:591
 #, fuzzy, python-format
 msgid ""
 "MidoClient.get_router_chains called: tenant_id=%(tenant_id)s "
@@ -5411,31 +5419,31 @@ msgstr ""
 "已呼叫 ChainManager.get_router_chains：tenant_id = %(tenant_id)s router_id = "
 "%(router_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:613
+#: neutron/plugins/midonet/midonet_lib.py:613
 #, fuzzy, python-format
 msgid "MidoClient.create_router_chains called: router=%(router)s"
 msgstr "已呼叫 MidonetPluginV2.create_router：路由器 = %r"
 
-#: quantum/plugins/midonet/midonet_lib.py:637
+#: neutron/plugins/midonet/midonet_lib.py:637
 #, fuzzy, python-format
 msgid "MidoClient.destroy_router_chains called: id=%(id)s"
 msgstr "已呼叫 MidonetPluginV2.delete_router：ID = %s"
 
-#: quantum/plugins/midonet/midonet_lib.py:652
+#: neutron/plugins/midonet/midonet_lib.py:652
 #, python-format
 msgid ""
 "MidoClient.link_router_to_metadata_router called: router=%(router)s, "
 "metadata_router=%(metadata_router)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:678
+#: neutron/plugins/midonet/midonet_lib.py:678
 #, fuzzy, python-format
 msgid ""
 "MidoClient.unlink_router_from_metadata_router called: id=%(id)s, "
 "metadata_router=%(metadata_router)s"
 msgstr "已呼叫 MidonetPluginV2.update_router：ID = %(id)s 路由器 = %(router)r"
 
-#: quantum/plugins/midonet/midonet_lib.py:701
+#: neutron/plugins/midonet/midonet_lib.py:701
 #, python-format
 msgid ""
 "MidoClient.setup_floating_ip called: router_id=%(router_id)s, "
@@ -5443,7 +5451,7 @@ msgid ""
 "fixed_ip=%(fixed_ip)sidentifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:765
+#: neutron/plugins/midonet/midonet_lib.py:765
 #, python-format
 msgid ""
 "MidoClient.clear_floating_ip called: router_id=%(router_id)s, "
@@ -5451,13 +5459,13 @@ msgid ""
 "identifier=%(identifier)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:786
-#: quantum/plugins/midonet/midonet_lib.py:793
+#: neutron/plugins/midonet/midonet_lib.py:786
+#: neutron/plugins/midonet/midonet_lib.py:793
 #, python-format
 msgid "deleting rule=%r"
 msgstr "正在刪除規則 = %r"
 
-#: quantum/plugins/midonet/midonet_lib.py:804
+#: neutron/plugins/midonet/midonet_lib.py:804
 #, fuzzy, python-format
 msgid ""
 "MidoClient.create_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
@@ -5466,7 +5474,7 @@ msgstr ""
 "已呼叫 ChainManager.create_for_sg：tenant_id = %(tenant_id)s sg_id = "
 "%(sg_id)s sg_name = %(sg_name)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:826
+#: neutron/plugins/midonet/midonet_lib.py:826
 #, fuzzy, python-format
 msgid ""
 "MidoClient.delete_for_sg called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s "
@@ -5475,22 +5483,22 @@ msgstr ""
 "已呼叫 ChainManager.delete_for_sg：tenant_id = %(tenant_id)s sg_id = "
 "%(sg_id)s sg_name = %(sg_name)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:835
+#: neutron/plugins/midonet/midonet_lib.py:835
 #, fuzzy, python-format
 msgid "MidoClient.delete_for_sg: deleting chain=%r"
 msgstr "ChainManager.delete_for_sg：正在刪除鏈 = %r"
 
-#: quantum/plugins/midonet/midonet_lib.py:843
+#: neutron/plugins/midonet/midonet_lib.py:843
 #, fuzzy, python-format
 msgid "MidoClient.delete_for_sg: deleting pg=%r"
 msgstr "ChainManager.delete_for_sg：正在刪除鏈 = %r"
 
-#: quantum/plugins/midonet/midonet_lib.py:850
+#: neutron/plugins/midonet/midonet_lib.py:850
 #, fuzzy, python-format
 msgid "MidoClient.get_sg_chains called: tenant_id=%(tenant_id)s sg_id=%(sg_id)s"
 msgstr "已呼叫 ChainManager.get_sg_chains：tenant_id = %(tenant_id)s sg_id = %(sg_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:870
+#: neutron/plugins/midonet/midonet_lib.py:870
 #, fuzzy, python-format
 msgid ""
 "MidoClient.get_port_groups_for_sg called: tenant_id=%(tenant_id)s "
@@ -5499,156 +5507,156 @@ msgstr ""
 "已呼叫 PortGroupManager.get_for_sg：tenant_id = %(tenant_id)s sg_id = "
 "%(sg_id)s"
 
-#: quantum/plugins/midonet/midonet_lib.py:879
+#: neutron/plugins/midonet/midonet_lib.py:879
 #, fuzzy, python-format
 msgid "MidoClient.get_port_groups_for_sg exiting: pg=%r"
 msgstr "PortGroupManager.get_for_sg 正在結束：pg = %r"
 
-#: quantum/plugins/midonet/midonet_lib.py:886
+#: neutron/plugins/midonet/midonet_lib.py:886
 #, fuzzy, python-format
 msgid "MidoClient.create_for_sg_rule called: rule=%r"
 msgstr "已呼叫 RuleManager.create_for_sg_rule：規則 = %r"
 
-#: quantum/plugins/midonet/midonet_lib.py:912
-#: quantum/plugins/midonet/midonet_lib.py:945
+#: neutron/plugins/midonet/midonet_lib.py:912
+#: neutron/plugins/midonet/midonet_lib.py:945
 #, python-format
 msgid "Don't know what to do with rule=%r"
 msgstr "不知道如何處理規則 = %r"
 
-#: quantum/plugins/midonet/midonet_lib.py:949
+#: neutron/plugins/midonet/midonet_lib.py:949
 #, python-format
 msgid ""
 "MidoClient.create_for_sg_rule: adding accept rule %(rule_id)s in "
 "portgroup %(port_group_id)s"
 msgstr ""
 
-#: quantum/plugins/midonet/midonet_lib.py:960
+#: neutron/plugins/midonet/midonet_lib.py:960
 #, fuzzy, python-format
 msgid "MidoClient.delete_for_sg_rule called: rule=%r"
 msgstr "已呼叫 RuleManager.delete_for_sg_rule：規則 = %r"
 
-#: quantum/plugins/midonet/midonet_lib.py:973
+#: neutron/plugins/midonet/midonet_lib.py:973
 #, fuzzy, python-format
 msgid "MidoClient.delete_for_sg_rule: deleting rule %r"
 msgstr "RuleManager.delete_for_sg_rule：正在刪除規則 %r"
 
-#: quantum/plugins/midonet/plugin.py:76
+#: neutron/plugins/midonet/plugin.py:76
 msgid ""
 "No provider router and metadata device ids found. But skipping because "
 "running in dev env."
 msgstr "找不到提供者路由器 ID 及 meta 資料裝置 ID。但是將跳過，因為正在開發環境中執行。"
 
-#: quantum/plugins/midonet/plugin.py:80
+#: neutron/plugins/midonet/plugin.py:80
 msgid ""
 "provider_router_id and metadata_router_id should be configured in the "
 "plugin config file"
 msgstr "應該在外掛程式配置檔中配置 provider_router_id 及 metadata_router_id"
 
-#: quantum/plugins/midonet/plugin.py:92
+#: neutron/plugins/midonet/plugin.py:92
 #, python-format
 msgid "MidonetPluginV2.create_subnet called: subnet=%r"
 msgstr "已呼叫 MidonetPluginV2.create_subnet：子網路 = %r"
 
-#: quantum/plugins/midonet/plugin.py:96
+#: neutron/plugins/midonet/plugin.py:96
 msgid "MidoNet doesn't support IPv6."
 msgstr "MidoNet 不支援 IPv6。"
 
-#: quantum/plugins/midonet/plugin.py:102
+#: neutron/plugins/midonet/plugin.py:102
 msgid "MidoNet doesn't support multiple subnets on the same network."
 msgstr "MidoNet 不支援同一個網路上的多個子網路。"
 
-#: quantum/plugins/midonet/plugin.py:125
+#: neutron/plugins/midonet/plugin.py:125
 #, python-format
 msgid "MidonetPluginV2.create_subnet exiting: sn_entry=%r"
 msgstr "MidonetPluginV2.create_subnet 正在結束：sn_entry = %r"
 
-#: quantum/plugins/midonet/plugin.py:134
+#: neutron/plugins/midonet/plugin.py:134
 #, python-format
 msgid "MidonetPluginV2.delete_subnet called: id=%s"
 msgstr "已呼叫 MidonetPluginV2.delete_subnet：ID = %s"
 
-#: quantum/plugins/midonet/plugin.py:149
+#: neutron/plugins/midonet/plugin.py:149
 msgid "MidonetPluginV2.delete_subnet exiting"
 msgstr "MidonetPluginV2.delete_subnet 正在結束"
 
-#: quantum/plugins/midonet/plugin.py:156
+#: neutron/plugins/midonet/plugin.py:156
 #, python-format
 msgid "MidonetPluginV2.create_network called: network=%r"
 msgstr "已呼叫 MidonetPluginV2.create_network：網路 = %r"
 
-#: quantum/plugins/midonet/plugin.py:160
+#: neutron/plugins/midonet/plugin.py:160
 #, fuzzy, python-format
 msgid ""
 "Ignoring admin_state_up=False for network=%r because it is not yet "
 "supported"
 msgstr "正在對網路 =%r 忽略 admin_state_up = False。將置換為 True"
 
-#: quantum/plugins/midonet/plugin.py:178
+#: neutron/plugins/midonet/plugin.py:178
 #, python-format
 msgid "MidonetPluginV2.create_network exiting: net=%r"
 msgstr "MidonetPluginV2.create_network 正在結束：網路 = %r"
 
-#: quantum/plugins/midonet/plugin.py:187
+#: neutron/plugins/midonet/plugin.py:187
 #, python-format
 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:193
-#: quantum/plugins/nicira/QuantumPlugin.py:1016
+#: neutron/plugins/midonet/plugin.py:193
+#: neutron/plugins/nicira/NeutronPlugin.py:1017
 msgid "admin_state_up=False networks are not supported."
 msgstr "不支援 admin_state_up = False 網路。"
 
-#: quantum/plugins/midonet/plugin.py:203
+#: neutron/plugins/midonet/plugin.py:203
 #, python-format
 msgid "MidonetPluginV2.update_network exiting: net=%r"
 msgstr "MidonetPluginV2.update_network 正在結束：網路 = %r"
 
-#: quantum/plugins/midonet/plugin.py:211
+#: neutron/plugins/midonet/plugin.py:211
 #, python-format
 msgid "MidonetPluginV2.get_network called: id=%(id)r, fields=%(fields)r"
 msgstr "已呼叫 MidonetPluginV2.get_network：ID = %(id)r，欄位 = %(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:217
+#: neutron/plugins/midonet/plugin.py:217
 #, python-format
 msgid "MidonetPluginV2.get_network exiting: qnet=%r"
 msgstr "MidonetPluginV2.get_network 正在結束：qnet = %r"
 
-#: quantum/plugins/midonet/plugin.py:222
+#: neutron/plugins/midonet/plugin.py:222
 #, python-format
 msgid "MidonetPluginV2.delete_network called: id=%r"
 msgstr "已呼叫 MidonetPluginV2.delete_network：ID = %r"
 
-#: quantum/plugins/midonet/plugin.py:227
+#: neutron/plugins/midonet/plugin.py:227
 #, python-format
-msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
-msgstr "在已刪除 Midonet 橋接器 = %r 時，無法刪除 Quantum DB"
+msgid "Failed to delete neutron db, while Midonet bridge=%rhad been deleted"
+msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:233
+#: neutron/plugins/midonet/plugin.py:233
 #, python-format
 msgid "MidonetPluginV2.create_port called: port=%r"
 msgstr "已呼叫 MidonetPluginV2.create_port：埠 = %r"
 
-#: quantum/plugins/midonet/plugin.py:274
+#: neutron/plugins/midonet/plugin.py:274
 #, python-format
 msgid "MidonetPluginV2.create_port exiting: port_db_entry=%r"
 msgstr "MidonetPluginV2.create_port 正在結束：port_db_entry = %r"
 
-#: quantum/plugins/midonet/plugin.py:280
+#: neutron/plugins/midonet/plugin.py:280
 #, python-format
 msgid "MidonetPluginV2.get_port called: id=%(id)s fields=%(fields)r"
 msgstr "已呼叫 MidonetPluginV2.get_port：ID = %(id)s 欄位 = %(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:289
+#: neutron/plugins/midonet/plugin.py:289
 #, python-format
 msgid "MidonetPluginV2.get_port exiting: port_db_entry=%r"
 msgstr "MidonetPluginV2.get_port 正在結束：port_db_entry = %r"
 
-#: quantum/plugins/midonet/plugin.py:295
+#: neutron/plugins/midonet/plugin.py:295
 #, python-format
 msgid "MidonetPluginV2.get_ports called: filters=%(filters)s fields=%(fields)r"
 msgstr "已呼叫 MidonetPluginV2.get_ports：過濾器 = %(filters)s 欄位 = %(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:309
+#: neutron/plugins/midonet/plugin.py:309
 #, python-format
 msgid ""
 "MidonetPluginV2.delete_port called: id=%(id)s "
@@ -5657,46 +5665,46 @@ msgstr ""
 "已呼叫 MidonetPluginV2.delete_port：ID = %(id)s "
 "l3_port_check=%(l3_port_check)r"
 
-#: quantum/plugins/midonet/plugin.py:339
+#: neutron/plugins/midonet/plugin.py:339
 #, python-format
 msgid "MidonetPluginV2.create_router called: router=%r"
 msgstr "已呼叫 MidonetPluginV2.create_router：路由器 = %r"
 
-#: quantum/plugins/midonet/plugin.py:342
+#: neutron/plugins/midonet/plugin.py:342
 #, python-format
 msgid "Ignoring admin_state_up=False for router=%r.  Overriding with True"
 msgstr ""
 
-#: quantum/plugins/midonet/plugin.py:360
+#: neutron/plugins/midonet/plugin.py:360
 #, python-format
 msgid "MidonetPluginV2.create_router exiting: qrouter=%r"
 msgstr "MidonetPluginV2.create_router 正在結束：qrouter = %r"
 
-#: quantum/plugins/midonet/plugin.py:365
+#: neutron/plugins/midonet/plugin.py:365
 #, python-format
 msgid "MidonetPluginV2.update_router called: id=%(id)s router=%(router)r"
 msgstr "已呼叫 MidonetPluginV2.update_router：ID = %(id)s 路由器 = %(router)r"
 
-#: quantum/plugins/midonet/plugin.py:369
+#: neutron/plugins/midonet/plugin.py:369
 msgid "admin_state_up=False routers are not supported."
 msgstr "不支援 admin_state_up = False 路由器。"
 
-#: quantum/plugins/midonet/plugin.py:419
+#: neutron/plugins/midonet/plugin.py:419
 #, python-format
 msgid "MidonetPluginV2.update_router exiting: qrouter=%r"
 msgstr "MidonetPluginV2.update_router 正在結束：qrouter = %r"
 
-#: quantum/plugins/midonet/plugin.py:424
+#: neutron/plugins/midonet/plugin.py:424
 #, python-format
 msgid "MidonetPluginV2.delete_router called: id=%s"
 msgstr "已呼叫 MidonetPluginV2.delete_router：ID = %s"
 
-#: quantum/plugins/midonet/plugin.py:429
+#: neutron/plugins/midonet/plugin.py:429
 #, python-format
 msgid "MidonetPluginV2.delete_router exiting: result=%s"
 msgstr "MidonetPluginV2.delete_router 正在結束：結果 = %s"
 
-#: quantum/plugins/midonet/plugin.py:434
+#: neutron/plugins/midonet/plugin.py:434
 #, python-format
 msgid ""
 "MidonetPluginV2.add_router_interface called: router_id=%(router_id)s "
@@ -5705,12 +5713,12 @@ msgstr ""
 "已呼叫 MidonetPluginV2.add_router_interface：router_id = %(router_id)s "
 "interface_info = %(interface_info)r"
 
-#: quantum/plugins/midonet/plugin.py:456
+#: neutron/plugins/midonet/plugin.py:456
 #, python-format
 msgid "MidonetPluginV2.add_router_interface exiting: qport=%r"
 msgstr "MidonetPluginV2.add_router_interface 正在結束：qport = %r"
 
-#: quantum/plugins/midonet/plugin.py:462
+#: neutron/plugins/midonet/plugin.py:462
 #, python-format
 msgid ""
 "MidonetPluginV2.remove_router_interface called: router_id=%(router_id)s "
@@ -5719,11 +5727,11 @@ msgstr ""
 "已呼叫 MidonetPluginV2.remove_router_interface：router_id = %(router_id)s "
 "interface_info = %(interface_info)r"
 
-#: quantum/plugins/midonet/plugin.py:509
+#: neutron/plugins/midonet/plugin.py:509
 msgid "MidonetPluginV2.remove_router_interface exiting"
 msgstr "MidonetPluginV2.remove_router_interface 正在結束"
 
-#: quantum/plugins/midonet/plugin.py:513
+#: neutron/plugins/midonet/plugin.py:513
 #, python-format
 msgid ""
 "MidonetPluginV2.update_floatingip called: id=%(id)s "
@@ -5732,12 +5740,12 @@ msgstr ""
 "已呼叫 MidonetPluginV2.update_floatingip：ID = %(id)s floatingip = "
 "%(floatingip)s "
 
-#: quantum/plugins/midonet/plugin.py:537
+#: neutron/plugins/midonet/plugin.py:537
 #, python-format
 msgid "MidonetPluginV2.update_floating_ip exiting: fip=%s"
 msgstr "MidonetPluginV2.update_floating_ip 正在結束：fip = %s"
 
-#: quantum/plugins/midonet/plugin.py:546
+#: neutron/plugins/midonet/plugin.py:546
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group called: "
@@ -5746,24 +5754,24 @@ msgstr ""
 "已呼叫 MidonetPluginV2.create_security_group：security_group = "
 "%(security_group)s default_sg = %(default_sg)s "
 
-#: quantum/plugins/midonet/plugin.py:562
+#: neutron/plugins/midonet/plugin.py:562
 #, python-format
 msgid "MidonetPluginV2.create_security_group exiting: sg_db_entry=%r"
 msgstr "MidonetPluginV2.create_security_group 正在結束：sg_db_entry = %r"
 
-#: quantum/plugins/midonet/plugin.py:568
+#: neutron/plugins/midonet/plugin.py:568
 #, python-format
 msgid "MidonetPluginV2.delete_security_group called: id=%s"
 msgstr "已呼叫 MidonetPluginV2.delete_security_group：ID = %s"
 
-#: quantum/plugins/midonet/plugin.py:597
+#: neutron/plugins/midonet/plugin.py:597
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_groups called: filters=%(filters)r "
 "fields=%(fields)r"
 msgstr "已呼叫 MidonetPluginV2.get_security_groups：過濾器 = %(filters)r 欄位 = %(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:604
+#: neutron/plugins/midonet/plugin.py:604
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group called: id=%(id)s fields=%(fields)r "
@@ -5772,7 +5780,7 @@ msgstr ""
 "已呼叫 MidonetPluginV2.get_security_group：ID = %(id)s 欄位 = %(fields)r "
 "tenant_id=%(tenant_id)s"
 
-#: quantum/plugins/midonet/plugin.py:611
+#: neutron/plugins/midonet/plugin.py:611
 #, python-format
 msgid ""
 "MidonetPluginV2.create_security_group_rule called: "
@@ -5781,17 +5789,17 @@ msgstr ""
 "已呼叫 MidonetPluginV2.create_security_group_rule：security_group_rule = "
 "%(security_group_rule)r"
 
-#: quantum/plugins/midonet/plugin.py:621
+#: neutron/plugins/midonet/plugin.py:621
 #, python-format
 msgid "MidonetPluginV2.create_security_group_rule exiting: rule_db_entry=%r"
 msgstr "MidonetPluginV2.create_security_group_rule 正在結束：rule_db_entry = %r"
 
-#: quantum/plugins/midonet/plugin.py:626
+#: neutron/plugins/midonet/plugin.py:626
 #, python-format
 msgid "MidonetPluginV2.delete_security_group_rule called: sgrid=%s"
 msgstr "已呼叫 MidonetPluginV2.delete_security_group_rule：sgrid = %s"
 
-#: quantum/plugins/midonet/plugin.py:641
+#: neutron/plugins/midonet/plugin.py:641
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rules called: filters=%(filters)r "
@@ -5800,220 +5808,220 @@ msgstr ""
 "已呼叫 MidonetPluginV2.get_security_group_rules：過濾器 = %(filters)r 欄位 = "
 "%(fields)r"
 
-#: quantum/plugins/midonet/plugin.py:648
+#: neutron/plugins/midonet/plugin.py:648
 #, python-format
 msgid ""
 "MidonetPluginV2.get_security_group_rule called: id=%(id)s "
 "fields=%(fields)r"
 msgstr "已呼叫 MidonetPluginV2.get_security_group_rule：ID = %(id)s 欄位 = %(fields)r"
 
-#: quantum/plugins/ml2/config.py:24
+#: neutron/plugins/ml2/config.py:24
 msgid ""
 "List of network type driver entrypoints to be loaded from the "
-"quantum.ml2.type_drivers namespace."
+"neutron.ml2.type_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:28
+#: neutron/plugins/ml2/config.py:28
 msgid "Ordered list of network_types to allocate as tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/config.py:32
+#: neutron/plugins/ml2/config.py:32
 msgid ""
 "List of networking mechanism driver entrypoints to be loaded from the "
-"quantum.ml2.mechanism_drivers namespace."
+"neutron.ml2.mechanism_drivers namespace."
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:44
+#: neutron/plugins/ml2/db.py:44
 #, fuzzy, python-format
 msgid "Added segment %(id)s of type %(network_type)s for network %(network_id)s"
 msgstr "無法收回 net-id = %(net_uuid)s 的不明網路類型 %(network_type)s"
 
-#: quantum/plugins/ml2/db.py:73
+#: neutron/plugins/ml2/db.py:73
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
 
-#: quantum/plugins/ml2/db.py:81
+#: neutron/plugins/ml2/db.py:81
 #, fuzzy, python-format
 msgid "get_port_and_sgs() called for port_id %s"
 msgstr "已呼叫 get_port_with_securitygroups()：port_id=%s"
 
-#: quantum/plugins/ml2/managers.py:40
+#: neutron/plugins/ml2/managers.py:40
 #, python-format
 msgid "Configured type driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:45
+#: neutron/plugins/ml2/managers.py:45
 #, fuzzy, python-format
 msgid "Loaded type driver names: %s"
 msgstr "已載入驅動程式 %s"
 
-#: quantum/plugins/ml2/managers.py:53
+#: neutron/plugins/ml2/managers.py:53
 #, python-format
 msgid ""
 "Type driver '%(new_driver)s' ignored because type driver '%(old_driver)s'"
 " is already registered for type '%(type)s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:61
+#: neutron/plugins/ml2/managers.py:61
 #, fuzzy, python-format
 msgid "Registered types: %s"
 msgstr "已建立路由器：%s"
 
-#: quantum/plugins/ml2/managers.py:69
+#: neutron/plugins/ml2/managers.py:69
 #, fuzzy, python-format
 msgid "No type driver for tenant network_type: %s. Service terminated!"
 msgstr "無效的 tenant_network_type：%s。已終止服務！"
 
-#: quantum/plugins/ml2/managers.py:73
+#: neutron/plugins/ml2/managers.py:73
 #, fuzzy, python-format
 msgid "Tenant network_types: %s"
 msgstr "不支援的網路類型 %s"
 
-#: quantum/plugins/ml2/managers.py:77
+#: neutron/plugins/ml2/managers.py:77
 #, python-format
 msgid "Initializing driver for type '%s'"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:86
+#: neutron/plugins/ml2/managers.py:86
 #, fuzzy, python-format
 msgid "network_type value '%s' not supported"
 msgstr "不支援網路類型 %s"
 
-#: quantum/plugins/ml2/managers.py:122
+#: neutron/plugins/ml2/managers.py:122
 #, python-format
 msgid "Configured mechanism driver names: %s"
 msgstr ""
 
-#: quantum/plugins/ml2/managers.py:127
+#: neutron/plugins/ml2/managers.py:127
 #, fuzzy, python-format
 msgid "Loaded mechanism driver names: %s"
 msgstr "已載入驅動程式 %s"
 
-#: quantum/plugins/ml2/plugin.py:99
+#: neutron/plugins/ml2/plugin.py:101
 #, fuzzy
 msgid "Modular L2 Plugin initialization complete"
 msgstr "已完成外掛程式起始設定"
 
-#: quantum/plugins/ml2/plugin.py:127
+#: neutron/plugins/ml2/plugin.py:129
 msgid "network_type required if other provider attributes specified"
 msgstr ""
 
-#: quantum/plugins/ml2/plugin.py:141
+#: neutron/plugins/ml2/plugin.py:143
 #, fuzzy, python-format
 msgid "Network %s has no segments"
 msgstr "代理程式上未使用網路 %s。"
 
-#: quantum/plugins/ml2/plugin.py:173
+#: neutron/plugins/ml2/plugin.py:175
 #, fuzzy
 msgid ""
 "In _notify_port_updated() for port %(port_id), network %(network_id) has "
 "no segments"
 msgstr "對網路 %(net_id)s 上埠 %(port_id)s 執行的 _nvp_delete_port 已完成"
 
-#: quantum/plugins/ml2/rpc.py:79
+#: neutron/plugins/ml2/rpc.py:79
 #, fuzzy, python-format
 msgid "Device %(device)s details requested by agent %(agent_id)s"
 msgstr "從 %(agent_id)s 要求的裝置 %(device)s 詳細資料"
 
-#: quantum/plugins/ml2/rpc.py:88
+#: neutron/plugins/ml2/rpc.py:88
 #, fuzzy, python-format
 msgid "Device %(device)s requested by agent %(agent_id)s not found in database"
 msgstr "從 %(agent_id)s 要求的裝置 %(device)s 詳細資料"
 
-#: quantum/plugins/ml2/rpc.py:94
+#: neutron/plugins/ml2/rpc.py:94
 #, python-format
 msgid ""
 "Device %(device)s requested by agent %(agent_id)s has network "
 "%(network_id) with no segments"
 msgstr ""
 
-#: quantum/plugins/ml2/rpc.py:114
+#: neutron/plugins/ml2/rpc.py:114
 #, fuzzy, python-format
 msgid "Returning: %s"
 msgstr "正在清除 %s"
 
-#: quantum/plugins/ml2/rpc.py:122
+#: neutron/plugins/ml2/rpc.py:122
 #, fuzzy, python-format
 msgid "Device %(device)s no longer exists at agent %(agent_id)s"
 msgstr "裝置 %(device)s 已不再存在於 %(agent_id)s 上"
 
-#: quantum/plugins/ml2/rpc.py:131
+#: neutron/plugins/ml2/rpc.py:131
 #, fuzzy, python-format
 msgid "Device %(device)s updated down by agent %(agent_id)s not found in database"
 msgstr "裝置 %(device)s 已在 %(agent_id)s 上啟動"
 
-#: quantum/plugins/ml2/rpc.py:145
+#: neutron/plugins/ml2/rpc.py:145
 #, fuzzy, python-format
 msgid "Device %(device)s up at agent %(agent_id)s"
 msgstr "裝置 %(device)s 已在 %(agent_id)s 上啟動"
 
-#: quantum/plugins/ml2/rpc.py:153
+#: neutron/plugins/ml2/rpc.py:153
 #, fuzzy, python-format
 msgid "Device %(device)s updated up by agent %(agent_id)s not found in database"
 msgstr "裝置 %(device)s 已在 %(agent_id)s 上啟動"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:31
+#: neutron/plugins/ml2/drivers/type_flat.py:31
 msgid ""
 "List of physical_network names with which flat networks can be created. "
 "Use * to allow flat networks with arbitrary physical_network names."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:69
+#: neutron/plugins/ml2/drivers/type_flat.py:69
 msgid "Arbitrary flat physical_network names allowed"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:74
+#: neutron/plugins/ml2/drivers/type_flat.py:74
 #, fuzzy, python-format
 msgid "Allowable flat physical_network names: %s"
 msgstr "無效的實體網路對映：%s"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:81
+#: neutron/plugins/ml2/drivers/type_flat.py:81
 #, fuzzy
 msgid "ML2 FlatTypeDriver initialization complete"
 msgstr "已完成外掛程式起始設定"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:86
+#: neutron/plugins/ml2/drivers/type_flat.py:86
 #, fuzzy
 msgid "physical_network required for flat provider network"
 msgstr "指定給 %s 網路的 physical_network"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:89
+#: neutron/plugins/ml2/drivers/type_flat.py:89
 #, fuzzy, python-format
 msgid "physical_network '%s' unknown for flat provider network"
 msgstr "未提供 physical_network"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:96
+#: neutron/plugins/ml2/drivers/type_flat.py:96
 #, python-format
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_flat.py:112
+#: neutron/plugins/ml2/drivers/type_flat.py:112
 #, fuzzy, python-format
 msgid "Reserving flat network on physical network %s"
 msgstr "實體網路 %s 沒有對映"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:130
+#: neutron/plugins/ml2/drivers/type_flat.py:130
 #, fuzzy, python-format
 msgid "Releasing flat network on physical network %s"
 msgstr "實體網路 %s 沒有對映"
 
-#: quantum/plugins/ml2/drivers/type_flat.py:133
+#: neutron/plugins/ml2/drivers/type_flat.py:133
 #, fuzzy, python-format
 msgid "No flat network found on physical network %s"
 msgstr "實體網路 %s 沒有對映"
 
-#: quantum/plugins/ml2/drivers/type_local.py:36
+#: neutron/plugins/ml2/drivers/type_local.py:36
 #, fuzzy
 msgid "ML2 LocalTypeDriver initialization complete"
 msgstr "已完成外掛程式起始設定"
 
-#: quantum/plugins/ml2/drivers/type_local.py:47
+#: neutron/plugins/ml2/drivers/type_local.py:47
 #, python-format
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:37
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -6021,416 +6029,416 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:91
+#: neutron/plugins/ml2/drivers/type_vlan.py:91
 #, fuzzy
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr "無效的 tenant_network_type：%s。已終止服務！"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:161
+#: neutron/plugins/ml2/drivers/type_vlan.py:161
 #, fuzzy
 msgid "VlanTypeDriver initialization complete"
 msgstr "已完成外掛程式起始設定"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:166
 #, fuzzy
 msgid "physical_network required for VLAN provider network"
 msgstr "指定給 %s 網路的 physical_network"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:169
+#: neutron/plugins/ml2/drivers/type_vlan.py:169
 #, fuzzy, python-format
 msgid "physical_network '%s' unknown for VLAN provider network"
 msgstr "指定給 %s 網路的 physical_network"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:175
+#: neutron/plugins/ml2/drivers/type_vlan.py:175
 #, fuzzy
 msgid "segmentation_id required for VLAN provider network"
 msgstr "指定給 %s 網路的 segmentation_id"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:178
+#: neutron/plugins/ml2/drivers/type_vlan.py:178
 #, fuzzy, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr "'%(data)s' 不在 %(min_value)s 到 %(max_value)s 的範圍內"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:188
+#: neutron/plugins/ml2/drivers/type_vlan.py:188
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:228
+#: neutron/plugins/ml2/drivers/type_vlan.py:228
 #, fuzzy, python-format
 msgid ""
 "Allocating vlan %(vlan_id)s on physical network %(physical_network)s from"
 " pool"
 msgstr "正在將實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s 從儲存區中移除"
 
-#: quantum/plugins/ml2/drivers/type_vlan.py:266
+#: neutron/plugins/ml2/drivers/type_vlan.py:266
 #, fuzzy, python-format
 msgid "No vlan_id %(vlan_id)s found on physical network %(physical_network)s"
 msgstr "正在釋放實體網路 %(physical_network)s 上的 VLAN %(vlan_id)s"
 
-#: quantum/plugins/mlnx/agent_notify_api.py:44
+#: neutron/plugins/mlnx/agent_notify_api.py:44
 msgid "Sending delete network message"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent_notify_api.py:52
+#: neutron/plugins/mlnx/agent_notify_api.py:52
 msgid "Sending update port message"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:86
+#: neutron/plugins/mlnx/mlnx_plugin.py:86
 msgid "Mellanox Embedded Switch Plugin initialisation complete"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:105
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:313
+#: neutron/plugins/mlnx/mlnx_plugin.py:105
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:315
 #, python-format
 msgid "%s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:212
+#: neutron/plugins/mlnx/mlnx_plugin.py:212
 #, python-format
 msgid "unknown provider:physical_network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:233
+#: neutron/plugins/mlnx/mlnx_plugin.py:233
 msgid "invalid vnic_type on port_create"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:235
+#: neutron/plugins/mlnx/mlnx_plugin.py:235
 msgid "vnic_type is not defined in port profile"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:286
+#: neutron/plugins/mlnx/mlnx_plugin.py:286
 msgid "delete network"
 msgstr ""
 
-#: quantum/plugins/mlnx/mlnx_plugin.py:336
+#: neutron/plugins/mlnx/mlnx_plugin.py:336
 #, python-format
 msgid "create_port with %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:55
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:55
 #, python-format
 msgid "Agent cache inconsistency - port id is not stored for %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:70
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:70
 #, python-format
 msgid "Network %s not defined on Agent."
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:83
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:83
 #, python-format
 msgid "Network %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:94
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:94
 #, python-format
 msgid "Connecting port %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:104
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:104
 #, python-format
 msgid "Binding VLAN ID %(seg_id)sto eSwitch for vNIC mac_address %(mac)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:113
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:113
 msgid "Network Type IB currently not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:125
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:125
 #, python-format
 msgid "Port_mac %s is not available on this agent"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:132
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:132
 msgid "creating VLAN Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:134
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:134
 msgid "currently IB network provisioning is not supported"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:136
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:136
 #, python-format
 msgid "Unknown network type %(network_type) for network %(network_id)"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:162
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:162
 msgid "Invalid Network ID, cannot remove Network"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:164
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:164
 #, python-format
 msgid "Delete network %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:266
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:266
 msgid "ports added!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:269
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:269
 msgid "ports removed!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:294
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:294
 #, python-format
 msgid "Adding port with mac %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:301
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:301
 #, python-format
 msgid ""
 "Unable to get device dev_details for device with mac_address %(device)s: "
 "due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:307
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:307
 #, python-format
 msgid "Port %s updated"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:308
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:308
 #, python-format
 msgid "Device details %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:317
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:317
 #, python-format
-msgid "Device with mac_address %s not defined on Quantum Plugin"
+msgid "Device with mac_address %s not defined on Neutron Plugin"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:324
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:324
 #, python-format
 msgid "Removing device with mac_address %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:331
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:331
 #, python-format
 msgid "Removing port failed for device %(device)s due to %(exc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:346
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:346
 msgid "eSwitch Agent Started!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:364
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:736
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:263
-#: quantum/tests/unit/openvswitch/test_ovs_tunnel.py:380
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:364
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:737
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:263
+#: neutron/tests/unit/openvswitch/test_ovs_tunnel.py:380
 msgid "Error in agent event loop"
 msgstr "代理程式事件迴圈發生錯誤"
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:394
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:394
 #, python-format
 msgid "Failed on Agent initialisation : %s. Agent terminated!"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/eswitch_quantum_agent.py:399
+#: neutron/plugins/mlnx/agent/eswitch_neutron_agent.py:399
 msgid "Agent initialised successfully, now running... "
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:58
+#: neutron/plugins/mlnx/agent/utils.py:58
 msgid "eSwitchD: Request timeout"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:68
+#: neutron/plugins/mlnx/agent/utils.py:68
 #, python-format
 msgid "Action %(action)s failed: %(reason)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:70
+#: neutron/plugins/mlnx/agent/utils.py:70
 #, python-format
 msgid "Unknown operation status %s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:75
+#: neutron/plugins/mlnx/agent/utils.py:75
 msgid "get_attached_vnics"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:82
+#: neutron/plugins/mlnx/agent/utils.py:82
 #, python-format
 msgid ""
 "Set Vlan  %(segmentation_id)s on Port %(port_mac)s on Fabric "
 "%(physical_network)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:95
+#: neutron/plugins/mlnx/agent/utils.py:95
 #, python-format
 msgid "Define Fabric %(fabric)s on interface %(ifc)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:104
+#: neutron/plugins/mlnx/agent/utils.py:104
 #, python-format
 msgid "Port Up for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:113
+#: neutron/plugins/mlnx/agent/utils.py:113
 #, python-format
 msgid "Port Down for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/agent/utils.py:122
+#: neutron/plugins/mlnx/agent/utils.py:122
 #, python-format
 msgid "Port Release for %(port_mac)s on fabric %(fabric)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:28
+#: neutron/plugins/mlnx/common/config.py:28
 msgid "Network type for tenant networks (local, ib, vlan, or none)"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:43
+#: neutron/plugins/mlnx/common/config.py:43
 msgid "type of VM network interface: direct or hosdev"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:46
+#: neutron/plugins/mlnx/common/config.py:46
 msgid "eswitch daemon end point"
 msgstr ""
 
-#: quantum/plugins/mlnx/common/config.py:48
+#: neutron/plugins/mlnx/common/config.py:48
 msgid ""
 "The number of milliseconds the agent will wait for response on request to"
 " daemon."
 msgstr ""
 
-#: quantum/plugins/mlnx/common/exceptions.py:22
+#: neutron/plugins/mlnx/common/exceptions.py:22
 #, python-format
 msgid "Mlnx Exception: %(err_msg)s"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:45
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:45
 #, python-format
 msgid "Removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:66
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:66
 #, python-format
 msgid "removing vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:121
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:121
 #, python-format
 msgid "Reserving vlan %(seg_id)s on physical network %(net)s from pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:140
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:140
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s from "
 "pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:145
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:145
 #, python-format
 msgid ""
 "Reserving specific vlan %(seg_id)s on physical network %(phy_net)s "
 "outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:172
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:172
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s to pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:177
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:177
 #, python-format
 msgid "Releasing vlan %(seg_id)s on physical network %(phy_net)s outside pool"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:183
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:183
 #, python-format
 msgid "vlan_id %(seg_id)s on physical network %(phy_net)s not found"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:225
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:225
 msgid "Get_port_from_device_mac() called"
 msgstr ""
 
-#: quantum/plugins/mlnx/db/mlnx_db_v2.py:233
+#: neutron/plugins/mlnx/db/mlnx_db_v2.py:233
 #, python-format
 msgid "Set_port_status as %s called"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:155
+#: neutron/plugins/nec/nec_plugin.py:157
 msgid "activate_port_if_ready(): skip, port.admin_state_up is False."
 msgstr "activate_port_if_ready()：跳過，port.admin_state_up 為 False。"
 
-#: quantum/plugins/nec/nec_plugin.py:159
+#: neutron/plugins/nec/nec_plugin.py:161
 msgid "activate_port_if_ready(): skip, network.admin_state_up is False."
 msgstr "activate_port_if_ready()：跳過，port.admin_state_up 為 False。"
 
-#: quantum/plugins/nec/nec_plugin.py:163
+#: neutron/plugins/nec/nec_plugin.py:165
 msgid "activate_port_if_ready(): skip, no portinfo for this port."
 msgstr "activate_port_if_ready()：跳過，此埠沒有 PortInfo。"
 
-#: quantum/plugins/nec/nec_plugin.py:182
+#: neutron/plugins/nec/nec_plugin.py:184
 msgid "activate_port_if_ready(): skip, ofc_port already exists."
 msgstr "activate_port_if_ready()：跳過，ofc_port 已存在。"
 
-#: quantum/plugins/nec/nec_plugin.py:188
+#: neutron/plugins/nec/nec_plugin.py:190
 #, python-format
 msgid "create_ofc_port() failed due to %s"
 msgstr "create_ofc_port() 由於 %s 而失敗"
 
-#: quantum/plugins/nec/nec_plugin.py:206
+#: neutron/plugins/nec/nec_plugin.py:208
 #, python-format
 msgid "delete_ofc_port() failed due to %s"
 msgstr "delete_ofc_port() 由於 %s 而失敗"
 
-#: quantum/plugins/nec/nec_plugin.py:210
+#: neutron/plugins/nec/nec_plugin.py:212
 msgid "deactivate_port(): skip, ofc_port does not exist."
 msgstr "deactivate_port()：跳過，ofc_port 不存在。"
 
-#: quantum/plugins/nec/nec_plugin.py:230
+#: neutron/plugins/nec/nec_plugin.py:232
 #, python-format
 msgid "NECPluginV2.create_network() called, network=%s ."
 msgstr "已呼叫 NECPluginV2.create_network()，網路 = %s。"
 
-#: quantum/plugins/nec/nec_plugin.py:249
+#: neutron/plugins/nec/nec_plugin.py:251
 #, python-format
 msgid "create_network() failed due to %s"
 msgstr "create_network() 由於 %s 而失敗"
 
-#: quantum/plugins/nec/nec_plugin.py:265
+#: neutron/plugins/nec/nec_plugin.py:267
 #, python-format
 msgid "NECPluginV2.update_network() called, id=%(id)s network=%(network)s ."
 msgstr "已呼叫 NECPluginV2.update_network()，ID = %(id)s 網路 = %(network)s。"
 
-#: quantum/plugins/nec/nec_plugin.py:315
+#: neutron/plugins/nec/nec_plugin.py:317
 #, python-format
 msgid "NECPluginV2.delete_network() called, id=%s ."
 msgstr "已呼叫 NECPluginV2.delete_network()，ID = %s。"
 
-#: quantum/plugins/nec/nec_plugin.py:324
+#: neutron/plugins/nec/nec_plugin.py:326
 #, python-format
 msgid "delete_network(): deleting auto-delete port from OFC: %s"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:339
+#: neutron/plugins/nec/nec_plugin.py:341
 #, python-format
 msgid "delete_network() failed due to %s"
 msgstr "delete_network() 由於 %s 而失敗"
 
-#: quantum/plugins/nec/nec_plugin.py:357
+#: neutron/plugins/nec/nec_plugin.py:359
 #, python-format
 msgid "delete_ofc_tenant() failed due to %s"
 msgstr "delete_ofc_tenant() 由於 %s 而失敗"
 
-#: quantum/plugins/nec/nec_plugin.py:369
+#: neutron/plugins/nec/nec_plugin.py:371
 #, python-format
 msgid "NECPluginV2.create_port() called, port=%s ."
 msgstr "已呼叫 NECPluginV2.create_port()，埠 = %s。"
 
-#: quantum/plugins/nec/nec_plugin.py:388
+#: neutron/plugins/nec/nec_plugin.py:390
 #, python-format
 msgid "NECPluginV2.update_port() called, id=%(id)s port=%(port)s ."
 msgstr "已呼叫 NECPluginV2.update_port()，ID = %(id)s 埠 = %(port)s。"
 
-#: quantum/plugins/nec/nec_plugin.py:414
+#: neutron/plugins/nec/nec_plugin.py:416
 #, python-format
 msgid "NECPluginV2.delete_port() called, id=%s ."
 msgstr "已呼叫 NECPluginV2.delete_port()，ID = %s。"
 
-#: quantum/plugins/nec/nec_plugin.py:475
+#: neutron/plugins/nec/nec_plugin.py:477
 msgid ""
 "_activate_packet_filter_if_ready(): skip, packet_filter.admin_state_up is"
 " False."
@@ -6438,44 +6446,44 @@ msgstr ""
 "_activate_packet_filter_if_ready()：跳過，packet_filter.admin_state_up 為 "
 "False。"
 
-#: quantum/plugins/nec/nec_plugin.py:479
+#: neutron/plugins/nec/nec_plugin.py:481
 msgid "_activate_packet_filter_if_ready(): skip, network.admin_state_up is False."
 msgstr "_activate_packet_filter_if_ready()：跳過，network.admin_state_up 為 False。"
 
-#: quantum/plugins/nec/nec_plugin.py:483
+#: neutron/plugins/nec/nec_plugin.py:485
 msgid "_activate_packet_filter_if_ready(): skip, invalid in_port_id."
 msgstr "_activate_packet_filter_if_ready()：跳過，無效的 in_port_id。"
 
-#: quantum/plugins/nec/nec_plugin.py:487
+#: neutron/plugins/nec/nec_plugin.py:489
 msgid "_activate_packet_filter_if_ready(): skip, no portinfo for in_port."
 msgstr "_activate_packet_filter_if_ready()：跳過，in_port 沒有 PortInfo。"
 
-#: quantum/plugins/nec/nec_plugin.py:493
+#: neutron/plugins/nec/nec_plugin.py:495
 msgid ""
 "_activate_packet_filter_if_ready(): skip, ofc_packet_filter already "
 "exists."
 msgstr "_activate_packet_filter_if_ready()：跳過，ofc_packet_filter 已存在。"
 
-#: quantum/plugins/nec/nec_plugin.py:502
+#: neutron/plugins/nec/nec_plugin.py:504
 #, python-format
 msgid "create_ofc_packet_filter() failed due to %s"
 msgstr "create_ofc_packet_filter() 由於 %s 而失敗"
 
-#: quantum/plugins/nec/nec_plugin.py:515
+#: neutron/plugins/nec/nec_plugin.py:517
 msgid "_deactivate_packet_filter(): skip, ofc_packet_filter does not exist."
 msgstr "_deactivate_packet_filter()：跳過，ofc_packet_filter 不存在。"
 
-#: quantum/plugins/nec/nec_plugin.py:521
+#: neutron/plugins/nec/nec_plugin.py:523
 #, python-format
 msgid "delete_ofc_packet_filter() failed due to %s"
 msgstr "delete_ofc_packet_filter() 由於 %s 而失敗"
 
-#: quantum/plugins/nec/nec_plugin.py:532
+#: neutron/plugins/nec/nec_plugin.py:534
 #, python-format
 msgid "NECPluginV2.create_packet_filter() called, packet_filter=%s ."
 msgstr "已呼叫 NECPluginV2.create_packet_filter()，packet_filter=%s。"
 
-#: quantum/plugins/nec/nec_plugin.py:548
+#: neutron/plugins/nec/nec_plugin.py:550
 #, python-format
 msgid ""
 "NECPluginV2.update_packet_filter() called, id=%(id)s "
@@ -6484,12 +6492,12 @@ msgstr ""
 "已呼叫 NECPluginV2.update_packet_filter()，ID = %(id)s packet_filter = "
 "%(packet_filter)s。"
 
-#: quantum/plugins/nec/nec_plugin.py:572
+#: neutron/plugins/nec/nec_plugin.py:574
 #, python-format
 msgid "NECPluginV2.delete_packet_filter() called, id=%s ."
 msgstr "已呼叫 NECPluginV2.delete_packet_filter()，ID = %s。"
 
-#: quantum/plugins/nec/nec_plugin.py:618
+#: neutron/plugins/nec/nec_plugin.py:620
 #, python-format
 msgid ""
 "NECPluginV2RPCCallbacks.get_port_from_device() called, device=%(device)s "
@@ -6498,19 +6506,19 @@ msgstr ""
 "已呼叫 NECPluginV2RPCCallbacks.get_port_from_device()，裝置 = %(device)s => "
 "%(ret)s。"
 
-#: quantum/plugins/nec/nec_plugin.py:649
+#: neutron/plugins/nec/nec_plugin.py:651
 #, python-format
 msgid "NECPluginV2RPCCallbacks.update_ports() called, kwargs=%s ."
 msgstr "已呼叫 NECPluginV2RPCCallbacks.update_ports()，kwargs = %s。"
 
-#: quantum/plugins/nec/nec_plugin.py:668
+#: neutron/plugins/nec/nec_plugin.py:670
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message due to portinfo for "
 "port_id=%s was not registered"
 msgstr ""
 
-#: quantum/plugins/nec/nec_plugin.py:673
+#: neutron/plugins/nec/nec_plugin.py:675
 #, python-format
 msgid ""
 "update_ports(): ignore port_removed message received from different host "
@@ -6518,308 +6526,248 @@ msgid ""
 "received_datapath_id=%(received)s)."
 msgstr ""
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:54
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:54
 #, python-format
 msgid "Update ports: added=%(added)s, removed=%(removed)s"
 msgstr "更新埠：已新增 = %(added)s，已移除 = %(removed)s"
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:66
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:66
 msgid "update_ports() failed."
 msgstr "update_ports() 失敗。"
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:80
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:80
 #, python-format
 msgid "port_update received: %s"
 msgstr "收到 port_update：%s"
 
-#: quantum/plugins/nec/agent/nec_quantum_agent.py:221
+#: neutron/plugins/nec/agent/nec_neutron_agent.py:221
 msgid "No port changed."
 msgstr "未變更埠。"
 
-#: quantum/plugins/nec/common/config.py:27
-#: quantum/plugins/openvswitch/common/config.py:30
-#: quantum/plugins/ryu/common/config.py:24
+#: neutron/plugins/nec/common/config.py:27
+#: neutron/plugins/openvswitch/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:24
 msgid "Integration bridge to use"
 msgstr "要使用的整合橋接器"
 
-#: quantum/plugins/nec/common/config.py:38
+#: neutron/plugins/nec/common/config.py:38
 msgid "Host to connect to"
 msgstr "要連接的主機"
 
-#: quantum/plugins/nec/common/config.py:40
+#: neutron/plugins/nec/common/config.py:40
 msgid "Port to connect to"
 msgstr "要連接的埠"
 
-#: quantum/plugins/nec/common/config.py:42
+#: neutron/plugins/nec/common/config.py:42
 msgid "Driver to use"
 msgstr "要使用的驅動程式"
 
-#: quantum/plugins/nec/common/config.py:44
+#: neutron/plugins/nec/common/config.py:44
 msgid "Enable packet filter"
 msgstr "啟用封包過濾器"
 
-#: quantum/plugins/nec/common/config.py:46
+#: neutron/plugins/nec/common/config.py:46
 msgid "Use SSL to connect"
 msgstr "使用 SSL 來連接"
 
-#: quantum/plugins/nec/common/config.py:48
+#: neutron/plugins/nec/common/config.py:48
 msgid "Key file"
 msgstr "金鑰檔"
 
-#: quantum/plugins/nec/common/config.py:50
+#: neutron/plugins/nec/common/config.py:50
 msgid "Certificate file"
 msgstr "憑證檔"
 
-#: quantum/plugins/nec/common/exceptions.py:22
+#: neutron/plugins/nec/common/exceptions.py:22
 #, python-format
 msgid "An OFC exception has occurred: %(reason)s"
 msgstr "發生 OFC 異常狀況：%(reason)s"
 
-#: quantum/plugins/nec/common/exceptions.py:26
+#: neutron/plugins/nec/common/exceptions.py:26
 #, python-format
 msgid "An exception occurred in NECPluginV2 DB: %(reason)s"
 msgstr "NECPluginV2 DB 發生異常狀況：%(reason)s"
 
-#: quantum/plugins/nec/common/exceptions.py:30
+#: neutron/plugins/nec/common/exceptions.py:30
 #, python-format
-msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
-msgstr "Quantum-OFC 資源對映的一致性已損毀：%(reason)s"
+msgid "Consistency of neutron-OFC resource map is broken: %(reason)s"
+msgstr ""
 
-#: quantum/plugins/nec/common/exceptions.py:35
+#: neutron/plugins/nec/common/exceptions.py:35
 #, python-format
 msgid "PortInfo %(id)s could not be found"
 msgstr "找不到 PortInfo %(id)s"
 
-#: quantum/plugins/nec/common/exceptions.py:39
+#: neutron/plugins/nec/common/exceptions.py:39
 #, python-format
 msgid "PacketFilter %(id)s could not be found"
 msgstr "找不到 PacketFilter %(id)s"
 
-#: quantum/plugins/nec/common/ofc_client.py:57
+#: neutron/plugins/nec/common/ofc_client.py:57
 #, python-format
 msgid "Client request: %(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 msgstr "用戶端要求：%(host)s:%(port)s %(method)s %(action)s [%(body)s]"
 
-#: quantum/plugins/nec/common/ofc_client.py:76
+#: neutron/plugins/nec/common/ofc_client.py:76
 #, python-format
 msgid "OFC returns [%(status)s:%(data)s]"
 msgstr "OFC 傳回 [%(status)s:%(data)s]"
 
-#: quantum/plugins/nec/common/ofc_client.py:86
+#: neutron/plugins/nec/common/ofc_client.py:86
 msgid "An operation on OFC is failed."
 msgstr "對 OFC 執行的作業失敗。"
 
-#: quantum/plugins/nec/common/ofc_client.py:89
+#: neutron/plugins/nec/common/ofc_client.py:89
 #, python-format
 msgid "Failed to connect OFC : %s"
 msgstr "無法連接 OFC：%s"
 
-#: quantum/plugins/nec/db/api.py:129
+#: neutron/plugins/nec/db/api.py:129
 #, python-format
 msgid "_del_ofc_item(): NotFound item (model=%(model)s, id=%(id)s) "
 msgstr "_del_ofc_item()：NotFound 項目（模型 = %(model)s，ID = %(id)s）"
 
-#: quantum/plugins/nec/db/api.py:142
+#: neutron/plugins/nec/db/api.py:142
 #, python-format
-msgid "NotFound %(resource)s for quantum_id=%(id)s."
-msgstr "quantum_id = %(id)s 的 %(resource)s NotFound。"
+msgid "NotFound %(resource)s for neutron_id=%(id)s."
+msgstr ""
 
-#: quantum/plugins/nec/db/api.py:168
+#: neutron/plugins/nec/db/api.py:168
 #, python-format
 msgid "_del_ofc_item(): NotFound item (resource=%(resource)s, id=%(id)s) "
 msgstr "_del_ofc_item()：NotFound 項目（資源 = %(resource)s，ID = %(id)s）"
 
-#: quantum/plugins/nec/db/api.py:201
+#: neutron/plugins/nec/db/api.py:201
 #, python-format
 msgid "del_portinfo(): NotFound portinfo for port_id: %s"
 msgstr "del_portinfo()：port_id 的 portinfo NotFound：%s"
 
-#: quantum/plugins/nec/db/api.py:207
-#: quantum/plugins/openvswitch/ovs_db_v2.py:321
+#: neutron/plugins/nec/db/api.py:207
+#: neutron/plugins/openvswitch/ovs_db_v2.py:321
 #, python-format
 msgid "get_port_with_securitygroups() called:port_id=%s"
 msgstr "已呼叫 get_port_with_securitygroups()：port_id=%s"
 
-#: quantum/plugins/nec/drivers/__init__.py:35
+#: neutron/plugins/nec/drivers/__init__.py:35
 #, python-format
 msgid "Loading OFC driver: %s"
 msgstr "正在載入 OFC 驅動程式：%s"
 
-#: quantum/plugins/nec/extensions/packetfilter.py:33
+#: neutron/plugins/nec/extensions/packetfilter.py:33
 msgid "Number of packet_filters allowed per tenant, -1 for unlimited"
 msgstr "每個 Tenant 所容許的 packet_filter 數目，-1 表示無限制"
 
-#: quantum/plugins/nicira/NvpApiClient.py:36
-#, python-format
-msgid "Unable to fetch NVP version from response headers:%s"
-msgstr "無法從回應標頭提取 NVP 版本：%s"
-
-#: quantum/plugins/nicira/NvpApiClient.py:112
-#, python-format
-msgid "NVPApiHelper.request() returns \"%s\""
-msgstr "NVPApiHelper.request() 傳回 \"%s\""
-
-#: quantum/plugins/nicira/NvpApiClient.py:125
-#, python-format
-msgid "Request timed out: %(method)s to %(url)s"
-msgstr "要求已逾時：%(method)s 到 %(url)s"
-
-#: quantum/plugins/nicira/NvpApiClient.py:136
-#, python-format
-msgid "Received error code: %s"
-msgstr "收到錯誤碼：%s"
-
-#: quantum/plugins/nicira/NvpApiClient.py:137
-#, python-format
-msgid "Server Error Message: %s"
-msgstr "伺服器錯誤訊息：%s"
-
-#: quantum/plugins/nicira/NvpApiClient.py:143
-#, python-format
-msgid ""
-"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
-"'%(body)s')"
-msgstr "%(method)s 到 %(url)s，非預期的回應碼：%(status)d（內容 = '%(body)s'）"
-
-#: quantum/plugins/nicira/NvpApiClient.py:213
-msgid "Server denied session's authentication credentials."
-msgstr "伺服器已拒絕階段作業的鑑別認證。"
-
-#: quantum/plugins/nicira/NvpApiClient.py:217
-msgid "An entity referenced in the request was not found."
-msgstr "找不到要求中參照的實體。"
-
-#: quantum/plugins/nicira/NvpApiClient.py:221
-msgid "Request conflicts with configuration on a different entity."
-msgstr "要求與不同實體上的配置相衝突。"
-
-#: quantum/plugins/nicira/NvpApiClient.py:226
-msgid ""
-"Request could not completed because the associated resource could not be "
-"reached."
-msgstr "無法完成要求，因為無法抵達相關聯的資源。"
-
-#: quantum/plugins/nicira/NvpApiClient.py:231
-msgid "The request is forbidden from accessing the referenced resource."
-msgstr "已禁止要求存取所參照的資源。"
-
-#: quantum/plugins/nicira/NvpApiClient.py:236
-msgid "The request has timed out."
-msgstr "要求已逾時。"
-
-#: quantum/plugins/nicira/QuantumPlugin.py:228
+#: neutron/plugins/nicira/NeutronPlugin.py:229
 #, python-format
 msgid "Unable to process default l2 gw service:%s"
 msgstr "無法處理預設 l2 gw 服務：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:263
+#: neutron/plugins/nicira/NeutronPlugin.py:264
 #, python-format
 msgid "Created NVP router port:%s"
 msgstr "已建立 NVP 路由器埠：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:265
+#: neutron/plugins/nicira/NeutronPlugin.py:266
 #, python-format
 msgid "Unable to create port on NVP logical router %s"
 msgstr "無法在 NVP 邏輯路由器 %s 上建立埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:268
+#: neutron/plugins/nicira/NeutronPlugin.py:269
 #, python-format
 msgid ""
-"Unable to create logical router port for quantum port id %(port_id)s on "
+"Unable to create logical router port for neutron port id %(port_id)s on "
 "router %(router_id)s"
-msgstr "無法給路由器 %(router_id)s 上的 Quantum 埠 ID %(port_id)s 建立邏輯路由器埠"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:291
+#: neutron/plugins/nicira/NeutronPlugin.py:292
 #, python-format
 msgid "Attached %(att)s to NVP router port %(port)s"
 msgstr "已將 %(att)s 連接至 NVP 路由器埠 %(port)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:297
+#: neutron/plugins/nicira/NeutronPlugin.py:298
 #, 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"
+"associated with Neutron %(q_port_id)s"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:303
+#: neutron/plugins/nicira/NeutronPlugin.py:304
 #, python-format
 msgid ""
-"Unable to plug attachment in router port %(r_port_id)s for quantum port "
+"Unable to plug attachment in router port %(r_port_id)s for neutron port "
 "id %(q_port_id)s on router %(router_id)s"
 msgstr ""
-"無法將連接裝置插入路由器 %(router_id)s 上 Quantum 埠 ID %(q_port_id)s 的路由器埠 "
-"%(r_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:348
+#: neutron/plugins/nicira/NeutronPlugin.py:349
 msgid "An exception occured while selecting logical switch for the port"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:374
-#: quantum/plugins/nicira/QuantumPlugin.py:409
-#: quantum/plugins/nicira/QuantumPlugin.py:593
+#: neutron/plugins/nicira/NeutronPlugin.py:375
+#: neutron/plugins/nicira/NeutronPlugin.py:410
+#: neutron/plugins/nicira/NeutronPlugin.py:594
 #, 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:394
-#: quantum/plugins/nicira/QuantumPlugin.py:474
-#: quantum/plugins/nicira/QuantumPlugin.py:612
+#: neutron/plugins/nicira/NeutronPlugin.py:395
+#: neutron/plugins/nicira/NeutronPlugin.py:475
+#: neutron/plugins/nicira/NeutronPlugin.py:613
 #, 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:398
+#: neutron/plugins/nicira/NeutronPlugin.py:399
 #, python-format
 msgid "An exception occured while plugging the interface into network:%s"
 msgstr "將介面插入網路時發生異常狀況：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:416
+#: neutron/plugins/nicira/NeutronPlugin.py:417
 #, python-format
 msgid "Port '%s' was already deleted on NVP platform"
 msgstr "已在 NVP 平台上刪除了埠 '%s'"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:425
+#: neutron/plugins/nicira/NeutronPlugin.py:426
 #, 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:431
+#: neutron/plugins/nicira/NeutronPlugin.py:432
 #, python-format
 msgid "port %s not found in NVP"
 msgstr "在 NVP 中找不到埠 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:450
-#: quantum/plugins/nicira/QuantumPlugin.py:868
+#: neutron/plugins/nicira/NeutronPlugin.py:451
+#: neutron/plugins/nicira/NeutronPlugin.py:869
 #, python-format
 msgid ""
 "Ignoring exception as this means the peer for port '%s' has already been "
 "deleted."
 msgstr "正在忽略異常狀況，因為這意味著埠 '%s' 的同層級已刪除。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:462
+#: neutron/plugins/nicira/NeutronPlugin.py:463
 #, python-format
 msgid ""
 "It is not allowed to create router interface ports on external networks "
 "as '%s'"
 msgstr "不容許在外部網路上建立路由器介面埠來作為 '%s'"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:481
+#: neutron/plugins/nicira/NeutronPlugin.py:482
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:490
 #, 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
+#: neutron/plugins/nicira/NeutronPlugin.py:536
 #, python-format
 msgid ""
 "_nvp_create_ext_gw_port completed on external network %(ext_net_id)s, "
@@ -6828,1039 +6776,1095 @@ msgstr ""
 "已在路由器 %(router_id)s 所連接的外部網路 %(ext_net_id)s 上完成 "
 "_nvp_create_ext_gw_port。NVP 埠 ID 為 %(nvp_port_id)s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:574
+#: neutron/plugins/nicira/NeutronPlugin.py:575
 #, python-format
 msgid "Logical router resource %s not found on NVP platform"
 msgstr "在 NVP 平台上找不到邏輯路由器資源 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:578
-#: quantum/plugins/nicira/QuantumPlugin.py:1737
+#: neutron/plugins/nicira/NeutronPlugin.py:579
+#: neutron/plugins/nicira/NeutronPlugin.py:1738
 msgid "Unable to update logical routeron NVP Platform"
 msgstr "無法在 NVP 平台上更新邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:580
+#: neutron/plugins/nicira/NeutronPlugin.py:581
 #, 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:650
+#: neutron/plugins/nicira/NeutronPlugin.py:651
 #, python-format
-msgid "Unable to find NVP uuid for Quantum port %s"
-msgstr "找不到 Quantum 埠 %s 的 NVP UUID"
+msgid "Unable to find NVP uuid for Neutron port %s"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:679
+#: neutron/plugins/nicira/NeutronPlugin.py:680
 #, python-format
 msgid "%s required"
 msgstr "需要 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:683
+#: neutron/plugins/nicira/NeutronPlugin.py:684
 msgid "Segmentation ID cannot be specified with flat network type"
 msgstr "無法使用平面網路類型來指定分段 ID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:687
+#: neutron/plugins/nicira/NeutronPlugin.py:688
 msgid "Segmentation ID must be specified with vlan network type"
 msgstr "必須使用 VLAN 網路類型來指定分段 ID"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:691
-#: quantum/plugins/nicira/QuantumPlugin.py:706
+#: neutron/plugins/nicira/NeutronPlugin.py:692
+#: neutron/plugins/nicira/NeutronPlugin.py:707
 #, python-format
 msgid "%(segmentation_id)s out of range (%(min_id)s through %(max_id)s)"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:712
+#: neutron/plugins/nicira/NeutronPlugin.py:713
 #, 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:743
+#: neutron/plugins/nicira/NeutronPlugin.py:744
 #, python-format
 msgid "No switch has available ports (%d checked)"
 msgstr "交換器沒有可用的埠（已檢查 %d 個）"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:765
+#: neutron/plugins/nicira/NeutronPlugin.py:766
 #, python-format
 msgid "Maximum number of logical ports reached for logical network %s"
 msgstr "已達到邏輯網路 %s 的邏輯埠數目上限"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:792
+#: neutron/plugins/nicira/NeutronPlugin.py:793
 #, 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:850
+#: neutron/plugins/nicira/NeutronPlugin.py:851
 #, python-format
-msgid "A nvp lport identifier was not found for quantum port '%s'"
-msgstr "找不到 Quantum 埠 '%s' 的 NVP lport ID"
+msgid "A nvp lport identifier was not found for neutron port '%s'"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:878
+#: neutron/plugins/nicira/NeutronPlugin.py:879
 #, python-format
 msgid "delete_network completed for tenant: %s"
 msgstr "已對 Tenant 完成 delete_network：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:881
+#: neutron/plugins/nicira/NeutronPlugin.py:882
 #, python-format
 msgid "Did not found lswitch %s in NVP"
 msgstr "在 NVP 中找不到 lswitch %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:907
+#: neutron/plugins/nicira/NeutronPlugin.py:908
 #, 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"
+"Current network status:%(nvp_net_status)s; Status in Neutron "
+"DB:%(neutron_status)s"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:917
-#: quantum/plugins/nicira/QuantumPlugin.py:965
+#: neutron/plugins/nicira/NeutronPlugin.py:918
+#: neutron/plugins/nicira/NeutronPlugin.py:966
 msgid "Unable to get logical switches"
 msgstr "無法取得邏輯交換器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:979
+#: neutron/plugins/nicira/NeutronPlugin.py:980
 #, python-format
-msgid "Logical Switch %s found in quantum database but not in NVP."
-msgstr "邏輯交換器 %s 位在 Quantum 資料庫中，但不在 NVP 中。"
+msgid "Logical Switch %s found in neutron database but not in NVP."
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:994
+#: neutron/plugins/nicira/NeutronPlugin.py:995
 #, python-format
 msgid ""
-"Found %s logical switches not bound to Quantum networks. Quantum and NVP "
+"Found %s logical switches not bound to Neutron networks. Neutron and NVP "
 "are potentially out of sync"
-msgstr "發現有 %s 個邏輯交換器未連結至 Quantum 網路。Quantum 與 NVP 可能不同步"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:998
+#: neutron/plugins/nicira/NeutronPlugin.py:999
 #, python-format
 msgid "get_networks() completed for tenant %s"
 msgstr "已對 Tenant %s 完成 get_networks()"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1082
+#: neutron/plugins/nicira/NeutronPlugin.py:1083
 #, python-format
 msgid "Lswitch %s not found in NVP"
 msgstr "在 NVP 中找不到 lswitch %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1091
+#: neutron/plugins/nicira/NeutronPlugin.py:1092
 msgid "Unable to get ports"
 msgstr "無法取得埠"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1118
+#: neutron/plugins/nicira/NeutronPlugin.py:1119
 #, python-format
-msgid "Quantum logical port %s was not found on NVP"
-msgstr "在 NVP 上找不到 Quantum 邏輯埠 %s"
+msgid "Neutron logical port %s was not found on NVP"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1125
+#: neutron/plugins/nicira/NeutronPlugin.py:1126
 #, python-format
 msgid ""
-"Found %s logical ports not bound to Quantum ports. Quantum and NVP are "
+"Found %s logical ports not bound to Neutron ports. Neutron and NVP are "
 "potentially out of sync"
-msgstr "發現有 %s 個邏輯埠未連結至 Quantum 埠。Quantum 與 NVP 可能不同步"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1191
+#: neutron/plugins/nicira/NeutronPlugin.py:1192
 #, python-format
 msgid "Network %s was not found in NVP."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1199
+#: neutron/plugins/nicira/NeutronPlugin.py:1200
 msgid "Unable to create port or set port attachment in NVP."
 msgstr "無法在 NVP 中建立埠或設定埠連接裝置。"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1203
+#: neutron/plugins/nicira/NeutronPlugin.py:1204
 #, 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:1278
+#: neutron/plugins/nicira/NeutronPlugin.py:1279
 #, python-format
 msgid "Update port request: %s"
 msgstr "更新埠要求：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1304
+#: neutron/plugins/nicira/NeutronPlugin.py:1305
 #, python-format
 msgid "Unable to update port id: %s."
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1428
-#: quantum/plugins/nicira/QuantumPlugin.py:1472
+#: neutron/plugins/nicira/NeutronPlugin.py:1429
+#: neutron/plugins/nicira/NeutronPlugin.py:1473
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr "網路 '%s' 不是有效的外部網路"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1441
+#: neutron/plugins/nicira/NeutronPlugin.py:1442
 msgid "Unable to create logical router on NVP Platform"
 msgstr "無法在 NVP 平台上建立邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1490
+#: neutron/plugins/nicira/NeutronPlugin.py:1491
 #, python-format
 msgid "Logical router %s not found on NVP Platform"
 msgstr "在 NVP 平台上找不到邏輯路由器 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1493
+#: neutron/plugins/nicira/NeutronPlugin.py:1494
 msgid "Unable to update logical router on NVP Platform"
 msgstr "無法在 NVP 平台上更新邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1513
+#: neutron/plugins/nicira/NeutronPlugin.py:1514
 #, python-format
 msgid "Logical router '%s' not found on NVP Platform"
 msgstr "在 NVP 平台上找不到邏輯路由器 '%s'"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1517
+#: neutron/plugins/nicira/NeutronPlugin.py:1518
 msgid "Unable to delete logical routeron NVP Platform"
 msgstr "無法在 NVP 平台上刪除邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1537
+#: neutron/plugins/nicira/NeutronPlugin.py:1538
 #, python-format
 msgid ""
-"Current router status:%(router_status)s;Status in Quantum "
+"Current router status:%(router_status)s;Status in Neutron "
 "DB:%(db_router_status)s"
-msgstr "現行路由器狀態：%(router_status)s；Quantum DB 中的狀態：%(db_router_status)s"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1564
+#: neutron/plugins/nicira/NeutronPlugin.py:1565
 msgid "Unable to get logical routers from NVP controller"
 msgstr "無法從 NVP 控制器取得邏輯路由器"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1586
+#: neutron/plugins/nicira/NeutronPlugin.py:1587
 #, python-format
 msgid ""
-"Found %s logical routers not bound to Quantum routers. Quantum and NVP "
+"Found %s logical routers not bound to Neutron routers. Neutron and NVP "
 "are potentially out of sync"
-msgstr "發現有 %s 個邏輯路由器未連結至 Quantum 路由器。Quantum 與 NVP 可能不同步"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1612
+#: neutron/plugins/nicira/NeutronPlugin.py:1613
 #, 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:1647
+#: neutron/plugins/nicira/NeutronPlugin.py:1648
 #, 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:1692
+#: neutron/plugins/nicira/NeutronPlugin.py:1693
 #, 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:1704
+#: neutron/plugins/nicira/NeutronPlugin.py:1705
 #, python-format
 msgid ""
-"Unable to find NVP logical router port for Quantum port id:%s. Was this "
+"Unable to find NVP logical router port for Neutron port id:%s. Was this "
 "port ever paired with a logical router?"
-msgstr "找不到 Quantum 埠 ID %s 的 NVP 邏輯路由器埠。此埠是否曾與邏輯路由器配對？"
+msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1733
+#: neutron/plugins/nicira/NeutronPlugin.py:1734
 #, python-format
 msgid "Logical router port resource %s not found on NVP platform"
 msgstr "在 NVP 平台上找不到邏輯路由器埠資源 %s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1759
+#: neutron/plugins/nicira/NeutronPlugin.py:1760
 #, 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:1765
+#: neutron/plugins/nicira/NeutronPlugin.py:1766
 msgid "An incorrect number of matching NAT rules was found on the NVP platform"
 msgstr "在 NVP 平台上找到的相符 NAT 規則數目不正確"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1831
+#: neutron/plugins/nicira/NeutronPlugin.py:1832
 #, python-format
 msgid "Address list for NVP logical router port:%s"
 msgstr "NVP 邏輯路由器埠的位址清單：%s"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1855
+#: neutron/plugins/nicira/NeutronPlugin.py:1856
 #, 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:1898
+#: neutron/plugins/nicira/NeutronPlugin.py:1899
 #, python-format
 msgid "The port '%s' is not associated with floating IPs"
 msgstr "埠 '%s' 未與浮動 IP 產生關聯"
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1901
+#: neutron/plugins/nicira/NeutronPlugin.py:1902
 #, python-format
 msgid "Nat rules not found in nvp for port: %s"
 msgstr ""
 
-#: quantum/plugins/nicira/QuantumPlugin.py:1927
+#: neutron/plugins/nicira/NeutronPlugin.py:1928
 #, 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:1949
+#: neutron/plugins/nicira/NeutronPlugin.py:1950
 msgid ""
 "Unable to remove gateway service from NVP plaform - the resource was not "
 "found"
 msgstr "無法將閘道服務從 NVP 平台中移除 - 找不到資源"
 
-#: quantum/plugins/nicira/nvp_cluster.py:55
+#: neutron/plugins/nicira/NvpApiClient.py:36
+#, python-format
+msgid "Unable to fetch NVP version from response headers:%s"
+msgstr "無法從回應標頭提取 NVP 版本：%s"
+
+#: neutron/plugins/nicira/NvpApiClient.py:112
+#, python-format
+msgid "NVPApiHelper.request() returns \"%s\""
+msgstr "NVPApiHelper.request() 傳回 \"%s\""
+
+#: neutron/plugins/nicira/NvpApiClient.py:125
+#, python-format
+msgid "Request timed out: %(method)s to %(url)s"
+msgstr "要求已逾時：%(method)s 到 %(url)s"
+
+#: neutron/plugins/nicira/NvpApiClient.py:136
+#, python-format
+msgid "Received error code: %s"
+msgstr "收到錯誤碼：%s"
+
+#: neutron/plugins/nicira/NvpApiClient.py:137
+#, python-format
+msgid "Server Error Message: %s"
+msgstr "伺服器錯誤訊息：%s"
+
+#: neutron/plugins/nicira/NvpApiClient.py:143
+#, python-format
+msgid ""
+"%(method)s to %(url)s, unexpected response code: %(status)d (content = "
+"'%(body)s')"
+msgstr "%(method)s 到 %(url)s，非預期的回應碼：%(status)d（內容 = '%(body)s'）"
+
+#: neutron/plugins/nicira/NvpApiClient.py:213
+msgid "Server denied session's authentication credentials."
+msgstr "伺服器已拒絕階段作業的鑑別認證。"
+
+#: neutron/plugins/nicira/NvpApiClient.py:217
+msgid "An entity referenced in the request was not found."
+msgstr "找不到要求中參照的實體。"
+
+#: neutron/plugins/nicira/NvpApiClient.py:221
+msgid "Request conflicts with configuration on a different entity."
+msgstr "要求與不同實體上的配置相衝突。"
+
+#: neutron/plugins/nicira/NvpApiClient.py:226
+msgid ""
+"Request could not completed because the associated resource could not be "
+"reached."
+msgstr "無法完成要求，因為無法抵達相關聯的資源。"
+
+#: neutron/plugins/nicira/NvpApiClient.py:231
+msgid "The request is forbidden from accessing the referenced resource."
+msgstr "已禁止要求存取所參照的資源。"
+
+#: neutron/plugins/nicira/NvpApiClient.py:236
+msgid "The request has timed out."
+msgstr "要求已逾時。"
+
+#: neutron/plugins/nicira/nvp_cluster.py:55
 #, python-format
 msgid ""
 "Attribute '%s' has been deprecated or moved to a new section. See new "
 "configuration file for details."
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:67
+#: neutron/plugins/nicira/nvp_cluster.py:67
 #, python-format
 msgid "The following cluster attributes were not specified: %s'"
 msgstr ""
 
-#: quantum/plugins/nicira/nvp_cluster.py:104
+#: neutron/plugins/nicira/nvp_cluster.py:104
 #, python-format
 msgid "Attribute:%s is empty or null"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:133
+#: neutron/plugins/nicira/nvplib.py:133
 #, python-format
 msgid "Specified name:'%s' exceeds maximum length. It will be truncated on NVP"
 msgstr "所指定的名稱 '%s' 超出長度上限。將在 NVP 上截斷"
 
-#: quantum/plugins/nicira/nvplib.py:153
+#: neutron/plugins/nicira/nvplib.py:153
 #, python-format
 msgid "NVP controller cluster version: %s"
 msgstr "NVP 控制器叢集版本：%s"
 
-#: quantum/plugins/nicira/nvplib.py:236
+#: neutron/plugins/nicira/nvplib.py:236
 #, python-format
 msgid "Created logical switch: %s"
 msgstr "已建立邏輯交換器：%s"
 
-#: quantum/plugins/nicira/nvplib.py:252 quantum/plugins/nicira/nvplib.py:414
+#: neutron/plugins/nicira/nvplib.py:252 neutron/plugins/nicira/nvplib.py:414
 #, python-format
 msgid "Network not found, Error: %s"
 msgstr "找不到網路，錯誤：%s"
 
-#: quantum/plugins/nicira/nvplib.py:441
+#: neutron/plugins/nicira/nvplib.py:441
 msgid "Port or Network not found"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:459
+#: neutron/plugins/nicira/nvplib.py:459
 #, python-format
 msgid ""
-"Looking for port with q_port_id tag '%(quantum_port_id)s' on: "
+"Looking for port with q_port_id tag '%(neutron_port_id)s' on: "
 "'%(lswitch_uuid)s'"
-msgstr "正在 '%(lswitch_uuid)s' 上尋找 q_port_id 標籤為 '%(quantum_port_id)s' 的埠"
+msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:467
+#: neutron/plugins/nicira/nvplib.py:467
 #, python-format
 msgid ""
-"Found '%(num_ports)d' ports with q_port_id tag: '%(quantum_port_id)s'. "
+"Found '%(num_ports)d' ports with q_port_id tag: '%(neutron_port_id)s'. "
 "Only 1 was expected."
-msgstr "找到 '%(num_ports)d' 個 q_port_id 標籤為 '%(quantum_port_id)s' 的埠。只需要 1 個。"
+msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:476
+#: neutron/plugins/nicira/nvplib.py:476
 #, python-format
 msgid "get_port() %(network)s %(port)s"
 msgstr "get_port() %(network)s %(port)s"
 
-#: quantum/plugins/nicira/nvplib.py:484 quantum/plugins/nicira/nvplib.py:538
+#: neutron/plugins/nicira/nvplib.py:484 neutron/plugins/nicira/nvplib.py:538
 #, python-format
 msgid "Port or Network not found, Error: %s"
 msgstr "找不到埠或網路，錯誤：%s"
 
-#: quantum/plugins/nicira/nvplib.py:533
+#: neutron/plugins/nicira/nvplib.py:533
 #, python-format
 msgid "Updated logical port %(result)s on logical switch %(uuid)s"
 msgstr ""
 
-#: quantum/plugins/nicira/nvplib.py:569
+#: neutron/plugins/nicira/nvplib.py:569
 #, python-format
 msgid "Created logical port %(result)s on logical swtich %(uuid)s"
 msgstr "已在邏輯交換器 %(uuid)s 上建立了邏輯埠 %(result)s"
 
-#: quantum/plugins/nicira/nvplib.py:593
+#: neutron/plugins/nicira/nvplib.py:593
 #, python-format
 msgid "Created logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr "已在邏輯路由器 %(lrouter_uuid)s 上建立了邏輯埠 %(lport_uuid)s"
 
-#: quantum/plugins/nicira/nvplib.py:623
+#: neutron/plugins/nicira/nvplib.py:623
 #, python-format
 msgid "Updated logical port %(lport_uuid)s on logical router %(lrouter_uuid)s"
 msgstr "已更新邏輯路由器 %(lrouter_uuid)s 上的邏輯埠 %(lport_uuid)s"
 
-#: quantum/plugins/nicira/nvplib.py:633
+#: neutron/plugins/nicira/nvplib.py:633
 #, python-format
 msgid ""
 "Delete logical router port %(lport_uuid)s on logical router "
 "%(lrouter_uuid)s"
 msgstr "刪除邏輯路由器 %(lrouter_uuid)s 上的邏輯路由器埠 %(lport_uuid)s"
 
-#: quantum/plugins/nicira/nvplib.py:688
+#: neutron/plugins/nicira/nvplib.py:688
 #, python-format
 msgid "Invalid NVP attachment type '%s'"
 msgstr "無效的 NVP 連接裝置類型 '%s'"
 
-#: quantum/plugins/nicira/nvplib.py:700
+#: neutron/plugins/nicira/nvplib.py:700
 #, python-format
 msgid "Port not found, Error: %s"
 msgstr "找不到埠，錯誤：%s"
 
-#: quantum/plugins/nicira/nvplib.py:819
+#: neutron/plugins/nicira/nvplib.py:819
 #, python-format
 msgid "Created Security Profile: %s"
 msgstr "已建立安全設定檔：%s"
 
-#: quantum/plugins/nicira/nvplib.py:845
+#: neutron/plugins/nicira/nvplib.py:845
 #, python-format
 msgid "Updated Security Profile: %s"
 msgstr "已更新安全設定檔：%s"
 
-#: quantum/plugins/nicira/nvplib.py:864
+#: neutron/plugins/nicira/nvplib.py:864
 #, python-format
 msgid "Invalid keys for NAT match: %s"
 msgstr "NAT 相符項的索引鍵無效：%s"
 
-#: quantum/plugins/nicira/nvplib.py:870
+#: neutron/plugins/nicira/nvplib.py:870
 #, python-format
 msgid "Creating NAT rule: %s"
 msgstr "正在建立 NAT 規則：%s"
 
-#: quantum/plugins/nicira/nvplib.py:884
+#: neutron/plugins/nicira/nvplib.py:884
 msgid ""
 "No SNAT rules cannot be applied as they are not available in this version"
 " of the NVP platform"
 msgstr "無法套用 SNAT 規則，因為這些規則在此版本的 NVP 平台中無法使用"
 
-#: quantum/plugins/nicira/nvplib.py:1019
+#: neutron/plugins/nicira/nvplib.py:1019
 #, python-format
 msgid "Router Port %(lport_id)s not found on router %(lrouter_id)s"
 msgstr "在路由器 %(lrouter_id)s 上找不到路由器埠 %(lport_id)s"
 
-#: quantum/plugins/nicira/nvplib.py:1024
+#: neutron/plugins/nicira/nvplib.py:1024
 #, python-format
 msgid ""
 "An exception occurred while updating IP addresses on a router logical "
 "port:%s"
 msgstr "更新路由器邏輯埠上的 IP 位址時發生異常狀況：%s"
 
-#: quantum/plugins/nicira/nvplib.py:1052
+#: neutron/plugins/nicira/nvplib.py:1052
 msgid "Failed to create logical queue"
 msgstr "無法建立邏輯佇列"
 
-#: quantum/plugins/nicira/nvplib.py:1063
+#: neutron/plugins/nicira/nvplib.py:1063
 msgid "Failed to delete logical queue"
 msgstr "無法刪除邏輯佇列"
 
-#: quantum/plugins/nicira/api_client/client.py:116
+#: neutron/plugins/nicira/api_client/client.py:116
 #, python-format
 msgid "[%d] no API providers currently available."
 msgstr "[%d] 目前沒有可用的 API 提供者。"
 
-#: quantum/plugins/nicira/api_client/client.py:119
+#: neutron/plugins/nicira/api_client/client.py:119
 #, python-format
 msgid "[%d] Waiting to acquire API client connection."
 msgstr "[%d] 正在等待獲得 API 用戶端連線。"
 
-#: quantum/plugins/nicira/api_client/client.py:123
+#: neutron/plugins/nicira/api_client/client.py:123
 #, python-format
 msgid "[%(rid)d] Connection %(conn)s idle for %(sec)0.2f seconds; reconnecting."
 msgstr "[%(rid)d] 連線 %(conn)s 已閒置 %(sec)0.2f 秒鐘；正在重新連接。"
 
-#: quantum/plugins/nicira/api_client/client.py:132
+#: neutron/plugins/nicira/api_client/client.py:132
 #, python-format
 msgid "[%(rid)d] Acquired connection %(conn)s. %(qsize)d connection(s) available."
 msgstr "[%(rid)d] 已獲得連線 %(conn)s。有 %(qsize)d 個連線可用。"
 
-#: quantum/plugins/nicira/api_client/client.py:152
+#: neutron/plugins/nicira/api_client/client.py:152
 #, python-format
 msgid ""
 "[%(rid)d] Released connection %(conn)s is not an API provider for the "
 "cluster"
 msgstr "[%(rid)d] 所釋放連線 %(conn)s 不是叢集的 API 提供者"
 
-#: quantum/plugins/nicira/api_client/client.py:161
+#: neutron/plugins/nicira/api_client/client.py:161
 #, python-format
 msgid "[%(rid)d] Connection returned in bad state, reconnecting to %(conn)s"
 msgstr "[%(rid)d] 連線傳回錯誤狀態，正在重新連接至 %(conn)s"
 
-#: quantum/plugins/nicira/api_client/client.py:186
+#: neutron/plugins/nicira/api_client/client.py:186
 #, python-format
 msgid "[%(rid)d] Released connection %(conn)s. %(qsize)d connection(s) available."
 msgstr "[%(rid)d] 已釋放連線 %(conn)s。有 %(qsize)d 個連線可用。"
 
-#: quantum/plugins/nicira/api_client/client.py:196
+#: neutron/plugins/nicira/api_client/client.py:196
 #, python-format
 msgid "Login request for an invalid connection: '%s'"
 msgstr "登入所要求的連線無效：'%s'"
 
-#: quantum/plugins/nicira/api_client/client.py:207
+#: neutron/plugins/nicira/api_client/client.py:207
 msgid "Waiting for auth to complete"
 msgstr "正在等待鑑別完成"
 
-#: quantum/plugins/nicira/api_client/client.py:249
+#: neutron/plugins/nicira/api_client/client.py:249
 #, python-format
 msgid "Invalid conn_params value: '%s'"
 msgstr "無效的 conn_params 值：'%s'"
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:148
+#: neutron/plugins/nicira/api_client/client_eventlet.py:148
 #, python-format
 msgid "NvpApiClient: login error \"%s\""
 msgstr "NvpApiClient：登入錯誤 \"%s\""
 
-#: quantum/plugins/nicira/api_client/client_eventlet.py:153
+#: neutron/plugins/nicira/api_client/client_eventlet.py:153
 #, python-format
 msgid "Saving new authentication cookie '%s'"
 msgstr "正在儲存新的鑑別 Cookie '%s'"
 
-#: quantum/plugins/nicira/api_client/common.py:30
+#: neutron/plugins/nicira/api_client/common.py:30
 #, python-format
 msgid "_conn_str() invalid connection type: %s"
 msgstr "_conn_str() 無效的連線類型：%s"
 
-#: quantum/plugins/nicira/api_client/request.py:92
+#: neutron/plugins/nicira/api_client/request.py:92
 msgid "No API connections available"
 msgstr "沒有可用的 API 連線"
 
-#: quantum/plugins/nicira/api_client/request.py:97
+#: neutron/plugins/nicira/api_client/request.py:97
 #, python-format
 msgid "[%(rid)d] Issuing - request %(conn)s"
 msgstr "[%(rid)d] 正在發出 - 要求 %(conn)s"
 
-#: quantum/plugins/nicira/api_client/request.py:122
+#: neutron/plugins/nicira/api_client/request.py:122
 #, python-format
 msgid "Setting X-Nvp-Wait-For-Config-Generation request header: '%s'"
 msgstr "正在設定 X-Nvp-Wait-For-Config-Generation 要求標頭：'%s'"
 
-#: quantum/plugins/nicira/api_client/request.py:128
+#: neutron/plugins/nicira/api_client/request.py:128
 #, python-format
 msgid "[%(rid)d] Exception issuing request: %(e)s"
 msgstr "[%(rid)d] 發出要求時發生異常狀況：%(e)s"
 
-#: quantum/plugins/nicira/api_client/request.py:135
+#: neutron/plugins/nicira/api_client/request.py:135
 #, python-format
 msgid "[%(rid)d] Completed request '%(conn)s': %(status)s (%(sec)0.2f seconds)"
 msgstr "[%(rid)d] 已完成要求 '%(conn)s'：%(status)s（%(sec)0.2f 秒鐘）"
 
-#: quantum/plugins/nicira/api_client/request.py:144
+#: neutron/plugins/nicira/api_client/request.py:144
 #, python-format
 msgid "Reading X-Nvp-config-Generation response header: '%s'"
 msgstr "正在讀取 X-Nvp-config-Generation 回應標頭：'%s'"
 
-#: quantum/plugins/nicira/api_client/request.py:173
+#: neutron/plugins/nicira/api_client/request.py:173
 #, python-format
 msgid "[%d] Maximum redirects exceeded, aborting request"
 msgstr "[%d] 已超出重新導向數目上限，正在中止要求"
 
-#: quantum/plugins/nicira/api_client/request.py:183
+#: neutron/plugins/nicira/api_client/request.py:183
 #, python-format
 msgid "[%(rid)d] Redirecting request to: %(conn)s"
 msgstr "[%(rid)d] 正在將要求重新導向至：%(conn)s"
 
-#: quantum/plugins/nicira/api_client/request.py:194
+#: neutron/plugins/nicira/api_client/request.py:194
 #, python-format
 msgid "[%(rid)d] Request '%(method) %(url)s' received: %(status)s"
 msgstr "[%(rid)d] 要求 '%(method) %(url)s' 收到：%(status)s"
 
-#: quantum/plugins/nicira/api_client/request.py:198
+#: neutron/plugins/nicira/api_client/request.py:198
 #, python-format
 msgid "Server error return: %s"
 msgstr "傳回伺服器錯誤：%s"
 
-#: quantum/plugins/nicira/api_client/request.py:202
+#: neutron/plugins/nicira/api_client/request.py:202
 msgid "Invalid server response"
 msgstr "無效的伺服器回應"
 
-#: quantum/plugins/nicira/api_client/request.py:205
+#: neutron/plugins/nicira/api_client/request.py:205
 #, python-format
 msgid "[%(rid)d] Failed request '%(conn)s': '%(msg)s' (%(sec)0.2f seconds)"
 msgstr "[%(rid)d] 失敗要求 '%(conn)s'：'%(msg)s'（%(sec)0.2f 秒鐘）"
 
-#: quantum/plugins/nicira/api_client/request.py:239
+#: neutron/plugins/nicira/api_client/request.py:239
 #, python-format
 msgid "[%d] Received redirect status without location header field"
 msgstr "[%d] 收到的重新導向狀態沒有位置標頭欄位"
 
-#: quantum/plugins/nicira/api_client/request.py:256
+#: neutron/plugins/nicira/api_client/request.py:256
 #, python-format
 msgid "[%(rid)d] Received invalid redirect location: '%(url)s'"
 msgstr "[%(rid)d] 收到無效的重新導向位置：'%(url)s'"
 
-#: quantum/plugins/nicira/api_client/request.py:260
+#: neutron/plugins/nicira/api_client/request.py:260
 #, python-format
 msgid "[%(rid)d] Received malformed redirect location: %(url)s"
 msgstr "[%(rid)d] 收到格式不正確的重新導向位置：%(url)s"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:111
+#: neutron/plugins/nicira/api_client/request_eventlet.py:111
 msgid "Joining an invalid green thread"
 msgstr "正在結合無效的綠色執行緒"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:131
+#: neutron/plugins/nicira/api_client/request_eventlet.py:131
 #, python-format
 msgid "[%d] Request timeout."
 msgstr "[%d] 要求逾時。"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:132
+#: neutron/plugins/nicira/api_client/request_eventlet.py:132
 msgid "Request timeout"
 msgstr "要求逾時"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:153
+#: neutron/plugins/nicira/api_client/request_eventlet.py:153
 #, python-format
 msgid "[%(rid)d] Completed request '%(method)s %(url)s': %(status)s"
 msgstr "[%(rid)d] 已完成要求 '%(method)s %(url)s'：%(status)s"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:160
+#: neutron/plugins/nicira/api_client/request_eventlet.py:160
 #, python-format
 msgid "[%(rid)d] Error while handling request: %(req)s"
 msgstr "[%(rid)d] 處理要求 %(req)s 時發生錯誤"
 
-#: quantum/plugins/nicira/api_client/request_eventlet.py:216
+#: neutron/plugins/nicira/api_client/request_eventlet.py:216
 #, python-format
 msgid "[%(rid)d] Failed to parse API provider: %(e)s"
 msgstr "[%(rid)d] 無法剖析 API 提供者：%(e)s"
 
-#: quantum/plugins/nicira/common/config.py:23
+#: neutron/plugins/nicira/common/config.py:23
 msgid ""
 "Maximum number of ports of a logical switch on a bridged transport zone "
 "(default 64)"
 msgstr "已橋接傳輸區域上邏輯交換器的埠數目上限（預設值 64）"
 
-#: quantum/plugins/nicira/common/config.py:26
+#: neutron/plugins/nicira/common/config.py:26
 msgid ""
 "Maximum number of ports of a logical switch on an overlay transport zone "
 "(default 64)"
 msgstr "套版傳輸區域上邏輯交換器的埠數目上限（預設值 64）"
 
-#: quantum/plugins/nicira/common/config.py:29
+#: neutron/plugins/nicira/common/config.py:29
 msgid "Maximum concurrent connections"
 msgstr "並行連線數上限"
 
-#: quantum/plugins/nicira/common/config.py:31
+#: neutron/plugins/nicira/common/config.py:31
 msgid ""
 "Number of seconds a generation id should be valid for (default -1 meaning"
 " do not time out)"
 msgstr "產生 ID 的有效秒數（預設值 -1 表示不逾時）"
 
-#: quantum/plugins/nicira/common/config.py:34
+#: neutron/plugins/nicira/common/config.py:34
 msgid ""
 "If set to access_network this enables a dedicated connection to the "
-"metadata proxy for metadata server access via Quantum router. If set to "
+"metadata proxy for metadata server access via Neutron router. If set to "
 "dhcp_host_route this enables host route injection via the dhcp agent. "
 "This option is only useful if running on a host that does not support "
 "namespaces otherwise access_network should be used."
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:42
+#: neutron/plugins/nicira/common/config.py:42
 msgid ""
 "Enables dedicated connection to the metadata proxy for metadata server "
-"access via Quantum router"
-msgstr "啟用 meta 資料 Proxy 的專用連線，以透過 Quantum 路由器來存取 meta 資料伺服器"
+"access via Neutron router"
+msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:45
+#: neutron/plugins/nicira/common/config.py:45
 msgid ""
 "The default network tranport type to use (stt, gre, bridge, ipsec_gre, or"
 " ipsec_stt)"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:52
+#: neutron/plugins/nicira/common/config.py:52
 msgid "User name for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:56
+#: neutron/plugins/nicira/common/config.py:56
 msgid "Password for NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:59
+#: neutron/plugins/nicira/common/config.py:59
 msgid "Total time limit for a cluster request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:62
+#: neutron/plugins/nicira/common/config.py:62
 msgid "Time before aborting a request"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:65
+#: neutron/plugins/nicira/common/config.py:65
 msgid "Number of time a request should be retried"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:68
+#: neutron/plugins/nicira/common/config.py:68
 msgid "Number of times a redirect should be followed"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:70
+#: neutron/plugins/nicira/common/config.py:70
 msgid "Lists the NVP controllers in this cluster"
 msgstr ""
 
-#: quantum/plugins/nicira/common/config.py:75
+#: neutron/plugins/nicira/common/config.py:75
 msgid ""
 "This is uuid of the default NVP Transport zone that will be used for "
-"creating tunneled isolated \"Quantum\" networks. It needs to be created "
-"in NVP before starting Quantum with the nvp plugin."
+"creating tunneled isolated \"Neutron\" networks. It needs to be created "
+"in NVP before starting Neutron with the nvp plugin."
 msgstr ""
-"這是將用於建立通道隔離 \"Quantum\" 網路的預設「NVP 傳輸」區域 UUID。它必須在 NVP 中建立，才能使用 NVP "
-"外掛程式來啟動 Quantum。"
 
-#: quantum/plugins/nicira/common/config.py:80
+#: neutron/plugins/nicira/common/config.py:80
 msgid ""
 "Optional paramter identifying the UUID of the cluster in NVP.  This can "
 "be retrieved from NVP management console \"admin\" section."
 msgstr "選用參數，用以識別 NVP 中叢集的 UUID。這可以從 NVP 管理主控台 \"admin\" 部分擷取。"
 
-#: quantum/plugins/nicira/common/config.py:84
+#: neutron/plugins/nicira/common/config.py:84
 msgid ""
 "Unique identifier of the NVP L3 Gateway service which will be used for "
 "implementing routers and floating IPs"
 msgstr "「NVP L3 閘道」服務的唯一 ID，此服務將用於實作路由器及浮動 IP"
 
-#: quantum/plugins/nicira/common/config.py:88
+#: neutron/plugins/nicira/common/config.py:88
 msgid ""
 "Unique identifier of the NVP L2 Gateway service which will be used by "
 "default for network gateways"
 msgstr "「NVP L2 閘道」服務的唯一 ID，依預設，此服務將由網路閘道使用"
 
-#: quantum/plugins/nicira/common/config.py:91
+#: neutron/plugins/nicira/common/config.py:91
 msgid ""
 "Name of the interface on a L2 Gateway transport nodewhich should be used "
 "by default when setting up a network connection"
 msgstr "「L2 閘道」傳輸節點上介面的名稱，依預設，在設定網路連線時應該使用此節點。"
 
-#: quantum/plugins/nicira/common/config.py:105
+#: neutron/plugins/nicira/common/config.py:105
 msgid ""
 "Describes a connection to a single controller. A different connection for"
 " each controller in the cluster can be specified; there must be at least "
 "one connection per cluster."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:24
+#: neutron/plugins/nicira/common/exceptions.py:24
 #, python-format
 msgid "An unexpected error occurred in the NVP Plugin:%(err_msg)s"
 msgstr "NVP 外掛程式發生非預期的錯誤：%(err_msg)s"
 
-#: quantum/plugins/nicira/common/exceptions.py:28
+#: neutron/plugins/nicira/common/exceptions.py:28
 #, python-format
 msgid "Invalid NVP connection parameters: %(conn_params)s"
 msgstr "無效的 NVP 連線參數：%(conn_params)s"
 
-#: quantum/plugins/nicira/common/exceptions.py:32
+#: neutron/plugins/nicira/common/exceptions.py:32
 #, python-format
 msgid ""
 "Invalid cluster values: %(invalid_attrs)s. Please ensure that these "
 "values are specified in the [DEFAULT] section of the nvp plugin ini file."
 msgstr ""
 
-#: quantum/plugins/nicira/common/exceptions.py:38
+#: neutron/plugins/nicira/common/exceptions.py:38
 #, python-format
 msgid "Unable to find cluster config entry for nova zone: %(nova_zone)s"
 msgstr "找不到 Nova 區域的叢集配置項目：%(nova_zone)s"
 
-#: quantum/plugins/nicira/common/exceptions.py:43
+#: neutron/plugins/nicira/common/exceptions.py:43
 #, python-format
 msgid ""
 "Unable to create port on network %(network)s. Maximum number of ports "
 "reached"
 msgstr "無法在網路 %(network)s 上建立埠。已達到埠數目上限"
 
-#: quantum/plugins/nicira/common/exceptions.py:48
+#: neutron/plugins/nicira/common/exceptions.py:48
 #, python-format
 msgid ""
 "Unable to plug an interface into the port %(port_id)s for network "
 "%(net_id)s. This interface is already plugged into port %(att_port_id)s"
 msgstr "無法將介面插入網路 %(net_id)s 的埠 %(port_id)s。此介面已插入埠 %(att_port_id)s"
 
-#: quantum/plugins/nicira/common/exceptions.py:54
+#: neutron/plugins/nicira/common/exceptions.py:54
 #, python-format
 msgid ""
 "While retrieving NAT rules, %(actual_rules)s were found whereas rules in "
 "the (%(min_rules)s,%(max_rules)s) interval were expected"
 msgstr "擷取 NAT 規則時，找到 %(actual_rules)s，但需要間隔為 (%(min_rules)s,%(max_rules)s) 的規則"
 
-#: quantum/plugins/nicira/common/metadata_access.py:112
+#: neutron/plugins/nicira/common/metadata_access.py:112
 msgid "Metadata access network is disabled"
 msgstr "已停用 meta 資料存取網路"
 
-#: quantum/plugins/nicira/common/metadata_access.py:115
+#: neutron/plugins/nicira/common/metadata_access.py:115
 msgid ""
 "Overlapping IPs must be enabled in order to setup the metadata access "
 "network"
 msgstr "必須啟用重疊 IP 才能設定 meta 資料存取網路"
 
-#: quantum/plugins/nicira/common/metadata_access.py:141
+#: neutron/plugins/nicira/common/metadata_access.py:141
 #, python-format
 msgid ""
 "No router interface found for router '%s'. No metadata access network "
 "should be created or destroyed"
 msgstr "找不到路由器 '%s' 的路由器介面。不應該建立或毀損 meta 資料存取網路"
 
-#: quantum/plugins/nicira/common/metadata_access.py:149
+#: neutron/plugins/nicira/common/metadata_access.py:149
 #, python-format
 msgid ""
 "An error occurred while operating on the metadata access network for "
 "router:'%s'"
 msgstr "對路由器的 meta 資料存取網路執行作業時發生錯誤：'%s'"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:47
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:47
 #, python-format
 msgid ""
 "Network Gateway '%(gateway_id)s' still has active mappings with one or "
-"more quantum networks."
-msgstr "網路閘道 '%(gateway_id)s' 仍具有內含一個以上 Quantum 網路的作用中對映。"
+"more neutron networks."
+msgstr ""
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:52
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:52
 #, python-format
 msgid ""
 "Port '%(port_id)s' is owned by '%(device_owner)s' and therefore cannot be"
 " deleted directly via the port API."
 msgstr "埠 '%(port_id)s' 是由 '%(device_owner)s' 擁有，因此無法直接透過埠 API 來刪除。"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:57
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:57
 #, python-format
 msgid ""
 "The specified mapping '%(mapping)s' is already in use on network gateway "
 "'%(gateway_id)s'."
 msgstr "所指定的對映 '%(mapping)s' 已在網路閘道 '%(gateway_id)s' 上使用。"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:62
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:62
 #, python-format
 msgid ""
 "Multiple network connections found on '%(gateway_id)s' with provided "
 "criteria."
 msgstr "在 '%(gateway_id)s' 上找到多個符合所提供準則的網路連線。"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:67
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:67
 #, python-format
 msgid ""
 "The connection %(network_mapping_info)s was not found on the network "
 "gateway '%(network_gateway_id)s'"
 msgstr "在網路閘道 '%(network_gateway_id)s' 上找不到連線 %(network_mapping_info)s"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:72
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:72
 #, python-format
 msgid "The network gateway %(gateway_id)s cannot be updated or deleted"
 msgstr "無法更新或刪除網路閘道 %(gateway_id)s"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:167
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:167
 msgid ""
 "A network identifier must be specified when connecting a network to a "
 "network gateway. Unable to complete operation"
 msgstr "將網路連接至網路閘道時必須指定網路 ID。無法完成作業"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:173
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:173
 #, python-format
 msgid ""
 "Invalid keys found among the ones provided in request body: "
 "%(connection_attrs)s."
 msgstr "在要求內文 %(connection_attrs)s 所提供的索引鍵中找到無效的索引鍵。"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:179
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:179
 msgid ""
 "In order to specify a segmentation id the segmentation type must be "
 "specified as well"
 msgstr "必須同時指定分段類型才能指定分段 ID"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:183
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:183
 msgid "Cannot specify a segmentation id when the segmentation type is flat"
 msgstr "當分段類型為平面時，無法指定分段 ID"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:232
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:232
 #, python-format
 msgid "Created network gateway with id:%s"
 msgstr "已建立 ID 為 %s 的網路閘道"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:244
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:244
 #, python-format
 msgid "Updated network gateway with id:%s"
 msgstr "已更新 ID 為 %s 的網路閘道"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:259
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:259
 #, python-format
 msgid "Network gateway '%s' was destroyed."
 msgstr "已毀損網路閘道 '%s'。"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:269
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:269
 #, 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/dbexts/nicira_networkgw_db.py:310
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:310
 #, 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/dbexts/nicira_networkgw_db.py:318
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:318
 #, 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/dbexts/nicira_networkgw_db.py:334
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:334
 #, python-format
 msgid "Ensured no Ip addresses are configured on port %s"
 msgstr "已確定沒有在埠 %s 上配置 IP 位址"
 
-#: quantum/plugins/nicira/dbexts/nicira_networkgw_db.py:344
+#: neutron/plugins/nicira/dbexts/nicira_networkgw_db.py:344
 #, python-format
 msgid ""
 "Disconnecting network '%(network_id)s' from gateway "
 "'%(network_gateway_id)s'"
 msgstr "正在切斷網路 '%(network_id)s' 與閘道 '%(network_gateway_id)s' 的連線"
 
-#: quantum/plugins/nicira/extensions/nvp_networkgw.py:66
+#: neutron/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:92
+#: neutron/plugins/nicira/extensions/nvp_networkgw.py:92
 msgid "number of network gateways allowed per tenant, -1 for unlimited"
 msgstr "每個 Tenant 所容許的網路閘道數目，-1 表示無限制"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:38
+#: neutron/plugins/nicira/extensions/nvp_qos.py:38
 msgid "Need to be admin in order to create queue called default"
 msgstr "必須成為管理者才能建立稱為 default 的佇列"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:42
+#: neutron/plugins/nicira/extensions/nvp_qos.py:42
 msgid "Default queue already exists."
 msgstr "預設佇列已存在。"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:46
+#: neutron/plugins/nicira/extensions/nvp_qos.py:46
 #, python-format
 msgid "Invalid value for dscp %(data)s must be integer."
 msgstr "DSCP %(data)s 的值無效，必須是整數。"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:50
+#: neutron/plugins/nicira/extensions/nvp_qos.py:50
 msgid "Invalid bandwidth rate, min greater than max."
 msgstr "頻寬速率無效，下限大於上限。"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:54
+#: neutron/plugins/nicira/extensions/nvp_qos.py:54
 #, python-format
 msgid "Invalid bandwidth rate, %(data)s must be a non negative integer."
 msgstr "無效的頻寬速率，%(data)s 必須為非負整數。"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:59
+#: neutron/plugins/nicira/extensions/nvp_qos.py:59
 msgid "No DSCP field needed when QoS workload marked trusted"
 msgstr "如果服務品質工作量已標示為受信任，則不需要 DSCP 欄位"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:63
+#: neutron/plugins/nicira/extensions/nvp_qos.py:63
 #, python-format
 msgid "Queue %(id)s does not exist"
 msgstr "佇列 %(id)s 不存在"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:67
+#: neutron/plugins/nicira/extensions/nvp_qos.py:67
 msgid "Unable to delete queue attached to port."
 msgstr "無法刪除埠所連接的佇列。"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:71
+#: neutron/plugins/nicira/extensions/nvp_qos.py:71
 msgid "Port is not associated with lqueue"
 msgstr "埠未與 lqueue 產生關聯"
 
-#: quantum/plugins/nicira/extensions/nvp_qos.py:82
+#: neutron/plugins/nicira/extensions/nvp_qos.py:82
 #, python-format
 msgid "'%s' must be a non negative integer."
 msgstr "'%s' 必須為非負整數。"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:214
+#: neutron/plugins/openvswitch/ovs_db_v2.py:214
 #, python-format
 msgid "Skipping unreasonable tunnel ID range %(tun_min)s:%(tun_max)s"
 msgstr "正在跳過不合理的通道 ID 範圍 %(tun_min)s:%(tun_max)s"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:233
+#: neutron/plugins/openvswitch/ovs_db_v2.py:233
 #, python-format
 msgid "Removing tunnel %s from pool"
 msgstr "正在將通道 %s 從儲存區中移除"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:262
+#: neutron/plugins/openvswitch/ovs_db_v2.py:262
 #, python-format
 msgid "Reserving tunnel %s from pool"
 msgstr "正在保留儲存區中的通道 %s"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:277
+#: neutron/plugins/openvswitch/ovs_db_v2.py:277
 #, python-format
 msgid "Reserving specific tunnel %s from pool"
 msgstr "正在保留儲存區中的特定通道 %s"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:280
+#: neutron/plugins/openvswitch/ovs_db_v2.py:280
 #, python-format
 msgid "Reserving specific tunnel %s outside pool"
 msgstr "正在保留儲存區外部的特定通道 %s"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:303
+#: neutron/plugins/openvswitch/ovs_db_v2.py:303
 #, python-format
 msgid "Releasing tunnel %s outside pool"
 msgstr "正在釋放儲存區外部的通道 %s"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:305
+#: neutron/plugins/openvswitch/ovs_db_v2.py:305
 #, python-format
 msgid "Releasing tunnel %s to pool"
 msgstr "正在將通道 %s 釋放到儲存區"
 
-#: quantum/plugins/openvswitch/ovs_db_v2.py:307
+#: neutron/plugins/openvswitch/ovs_db_v2.py:307
 #, python-format
 msgid "tunnel_id %s not found"
 msgstr "找不到 tunnel_id %s"
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:140
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:140
 #, python-format
 msgid "Device %(device)s up on %(agent_id)s"
 msgstr "裝置 %(device)s 已在 %(agent_id)s 上啟動"
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:275
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:275
 #, python-format
 msgid "Invalid tenant_network_type: %s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:285
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:285
 #, python-format
 msgid "Tunneling disabled but tenant_network_type is '%s'. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:324
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:326
 #, python-format
 msgid "Invalid tunnel ID range: '%(range)s' - %(e)s. Server terminated!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:328
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:330
 #, python-format
 msgid "Tunnel ID ranges: %s"
 msgstr "通道 ID 範圍：%s"
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:381
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:383
 #, python-format
 msgid "%s networks are not enabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/ovs_quantum_plugin.py:384
+#: neutron/plugins/openvswitch/ovs_neutron_plugin.py:386
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:255
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:256
 #, python-format
 msgid "Network %s not used on agent."
 msgstr "代理程式上未使用網路 %s。"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:286
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:287
 msgid "tunnel_update received"
 msgstr "收到 tunnel_update"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:317
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:318
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr "net-id = %s 沒有可用的本端 VLAN"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:320
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:321
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr "正在將 %(vlan_id)s 指派為 net-id = %(net_uuid)s 的本端 VLAN"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:342
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:343
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:361
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:362
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
@@ -7869,7 +7873,7 @@ msgstr ""
 "無法將平面網路供應給 net-id = %(net_uuid)s - physical_network %(physical_network)s "
 "沒有橋接器"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:381
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:382
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
@@ -7878,416 +7882,416 @@ msgstr ""
 "無法將 VLAN 網路供應給 net-id = %(net_uuid)s - physical_network "
 "%(physical_network)s 沒有橋接器"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:390
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:391
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr "無法將不明的網路類型 %(network_type)s 供應給 net-id=%(net_uuid)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:402
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:403
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr "正在從 net-id = %(net_uuid)s 收回 VLAN = %(vlan_id)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:436
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:437
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr "無法收回 net-id = %(net_uuid)s 的不明網路類型 %(network_type)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:487
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:488
 #, python-format
 msgid "port_unbound() net_uuid %s not in local_vlan_map"
 msgstr "port_unbound() net_uuid %s 不在 local_vlan_map 中"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:500
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:501
 #, python-format
 msgid "port_unbound: vif_id %s not in local_vlan_map"
 msgstr "port_unbound：vif_id %s 不在 local_vlan_map 中"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:545
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:546
 msgid ""
 "Failed to create OVS patch port. Cannot have tunneling enabled on this "
 "agent, since this version of OVS does not support tunnels or patch ports."
 " Agent terminated!"
 msgstr "無法建立 OVS 修補程式埠。無法在此代理程式上啟用通道作業，因為此 OVS 版本不支援通道或修補程式埠。已終止代理程式！"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:566
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:567
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr "正在將實體網路 %(physical_network)s 對映到橋接器 %(bridge)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:572
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:573
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr "實體網路 %(physical_network)s 的橋接器 %(bridge)s 不存在。已終止代理程式！"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:626
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
 #, python-format
 msgid "No VIF port for port %s defined on agent."
 msgstr "未在代理程式上給埠 %s 定義 VIF 埠。"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:703
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:704
 #, python-format
 msgid "Unable to sync tunnel IP %(local_ip)s: %(e)s"
 msgstr "無法同步通道 IP %(local_ip)s：%(e)s"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:723
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:724
 msgid "Agent tunnel out of sync with plugin!"
 msgstr "代理程式通道與外掛程式不同步！"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:755
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:756
 msgid "Checking OVS version for VXLAN support"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:763
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
 #, python-format
 msgid ""
 "Failed userspace version check for Open vSwitch with VXLAN support. To "
 "use VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:774
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:775
 #, python-format
 msgid ""
 "Failed kernel version check for Open vSwitch with VXLAN support. To use "
 "VXLAN tunnels with OVS, please ensure the OVS version is %s or newer!"
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:781
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:782
 #, python-format
 msgid ""
 "Cannot determine kernel Open vSwitch version, please ensure your Open "
 "vSwitch kernel module is at least version %s to support VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:786
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:787
 #, python-format
 msgid ""
 "Unable to determine Open vSwitch version. Please ensure that its version "
 "is %s or newer to use VXLAN tunnels with OVS."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:801
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:802
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr "剖析 bridge_mappings 時失敗：%s。"
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:819
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:820
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
-#: quantum/plugins/openvswitch/agent/ovs_quantum_agent.py:834
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:836
 #, python-format
 msgid "%s Agent terminated!"
 msgstr "%s 已終止代理程式！"
 
-#: quantum/plugins/openvswitch/common/config.py:32
+#: neutron/plugins/openvswitch/common/config.py:32
 msgid "Enable tunneling support"
 msgstr "啟用通道作業支援"
 
-#: quantum/plugins/openvswitch/common/config.py:34
+#: neutron/plugins/openvswitch/common/config.py:34
 msgid "Tunnel bridge to use"
 msgstr "要使用的通道橋接器"
 
-#: quantum/plugins/openvswitch/common/config.py:36
+#: neutron/plugins/openvswitch/common/config.py:36
 msgid "Peer patch port in integration bridge for tunnel bridge"
 msgstr "整合橋接器中用於通道橋接器的同層級修補程式埠"
 
-#: quantum/plugins/openvswitch/common/config.py:39
+#: neutron/plugins/openvswitch/common/config.py:39
 msgid "Peer patch port in tunnel bridge for integration bridge"
 msgstr "通道橋接器中用於整合橋接器的同層級修補程式埠"
 
-#: quantum/plugins/openvswitch/common/config.py:42
+#: neutron/plugins/openvswitch/common/config.py:42
 msgid "Local IP address of GRE tunnel endpoints."
 msgstr "GRE 通道端點的本端 IP 位址。"
 
-#: quantum/plugins/openvswitch/common/config.py:45
+#: neutron/plugins/openvswitch/common/config.py:45
 msgid "List of <physical_network>:<bridge>"
 msgstr "<physical_network>:<bridge> 的清單"
 
-#: quantum/plugins/openvswitch/common/config.py:47
+#: neutron/plugins/openvswitch/common/config.py:47
 msgid "Network type for tenant networks (local, vlan, gre, vxlan, or none)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:55
+#: neutron/plugins/openvswitch/common/config.py:55
 msgid "List of <tun_min>:<tun_max>"
 msgstr "<tun_min>:<tun_max> 的清單"
 
-#: quantum/plugins/openvswitch/common/config.py:63
+#: neutron/plugins/openvswitch/common/config.py:63
 msgid "Network type for agent tunnel networks (gre or vxlan)"
 msgstr ""
 
-#: quantum/plugins/openvswitch/common/config.py:66
+#: neutron/plugins/openvswitch/common/config.py:66
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: quantum/plugins/plumgrid/common/exceptions.py:26
+#: neutron/plugins/plumgrid/common/exceptions.py:26
 #, python-format
 msgid "An unexpected error occurred in the PLUMgrid Plugin: %(err_msg)s"
 msgstr "PLUMgrid 外掛程式發生非預期的錯誤：%(err_msg)s"
 
-#: quantum/plugins/plumgrid/common/exceptions.py:31
+#: neutron/plugins/plumgrid/common/exceptions.py:31
 #, python-format
 msgid "Connection failed with PLUMgrid NOS: %(err_msg)s"
 msgstr "與 PLUMgrid NOS 連線失敗：%(err_msg)s"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
-msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
-msgstr "QuantumPluginPLUMgrid 狀態：建立 NOS 主體資料"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_nos_snippets.py:34
+msgid "NeutronPluginPLUMgrid Status: NOS Body Data Creation"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:40
 msgid "PLUMgrid NOS server to connect to"
 msgstr "要連接的 PLUMgrid NOS 伺服器"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:42
 msgid "PLUMgrid NOS server port to connect to"
 msgstr "要連接的 PLUMgrid NOS 伺服器埠"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:44
 msgid "PLUMgrid NOS admin username"
 msgstr "PLUMgrid NOS 管理者使用者名稱"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:46
 msgid "PLUMgrid NOS admin password"
 msgstr "PLUMgrid NOS 管理者密碼"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:48
 msgid "PLUMgrid NOS server timeout"
 msgstr "PLUMgrid NOS 伺服器逾時"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:50
 msgid "PLUMgrid NOS topology name"
 msgstr "PLUMgrid NOS 拓蹼名稱"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
-msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
-msgstr "QuantumPluginPLUMgrid 狀態：正在啟動外掛程式"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:59
+msgid "NeutronPluginPLUMgrid Status: Starting Plugin"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
-msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
-msgstr "QuantumPluginPLUMgrid 狀態：正在中止外掛程式"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:74
+msgid "NeutronPluginPLUMgrid Status: Aborting Plugin"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:82
 #, python-format
-msgid "QuantumPluginPLUMgrid NOS: %s"
-msgstr "QuantumPluginPLUMgrid NOS：%s"
+msgid "NeutronPluginPLUMgrid NOS: %s"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
-msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
-msgstr "QuantumPluginPLUMgrid 狀態：配置檔中遺漏了 NOS 值"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:84
+msgid "NeutronPluginPLUMgrid Status: NOS value is missing in config file"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:87
 msgid ""
-"QuantumPluginPLUMgrid Status: Quantum server with PLUMgrid Plugin has "
+"NeutronPluginPLUMgrid Status: Neutron server with PLUMgrid Plugin has "
 "started"
-msgstr "QuantumPluginPLUMgrid 狀態：已啟動含有 PLUMgrid 外掛程式的 Quantum 伺服器"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
-msgid "QuantumPluginPLUMgrid Status: create_network() called"
-msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 create_network()"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:93
+msgid "NeutronPluginPLUMgrid Status: create_network() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:105
 #, python-format
-msgid "QuantumPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
+msgid "NeutronPluginPLUMgrid Status: %(tenant_id)s, %(network)s, %(network_id)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:119
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:151
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:175
 msgid "PLUMgrid NOS communication failed"
 msgstr "PLUMgrid NOS 通訊失敗"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
-msgid "QuantumPluginPLUMgridV2.update_network() called"
-msgstr "已呼叫 QuantumPluginPLUMgridV2.update_network()"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:129
+msgid "NeutronPluginPLUMgridV2.update_network() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
-msgid "QuantumPluginPLUMgrid Status: delete_network() called"
-msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 delete_network()"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:160
+msgid "NeutronPluginPLUMgrid Status: delete_network() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
-msgid "QuantumPluginPLUMgrid Status: create_port() called"
-msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 create_port()"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:181
+msgid "NeutronPluginPLUMgrid Status: create_port() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
-msgid "QuantumPluginPLUMgrid Status: update_port() called"
-msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 update_port()"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:193
+msgid "NeutronPluginPLUMgrid Status: update_port() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
-msgid "QuantumPluginPLUMgrid Status: delete_port() called"
-msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 delete_port()"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:205
+msgid "NeutronPluginPLUMgrid Status: delete_port() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
-msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
-msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 create_subnet()"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:216
+msgid "NeutronPluginPLUMgrid Status: create_subnet() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:234
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:257
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:289
 msgid "PLUMgrid NOS communication failed: "
 msgstr "PLUMgrid NOS 通訊失敗："
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
-msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
-msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 delete_subnet()"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:243
+msgid "NeutronPluginPLUMgrid Status: delete_subnet() called"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:318
 #, python-format
 msgid ""
 "Network with admin_state_up=False are not supported yet by this plugin. "
 "Ignoring setting for network %s"
 msgstr "此外掛程式尚不支援 admin_state_up = False 的網路。正在忽略對網路 %s 的設定"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/plumgrid_plugin.py:322
 msgid "Network Admin State Validation Falied: "
 msgstr "網路管理狀態驗證失敗："
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
-msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
-msgstr "QuantumPluginPLUMgrid 狀態：已開始 REST 連線"
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:40
+msgid "NeutronPluginPLUMgrid Status: REST Connection Started"
+msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:53
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(server)s %(port)s %(action)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:59
 msgid "PLUMgrid_NOS_Server: Could not establish HTTP connection"
 msgstr "PLUMgrid_NOS_Server：無法建立 HTTP 連線"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:64
 #, python-format
 msgid "PLUMgrid_NOS_Server Sending Data: %(nos_url)s %(body_data)s %(headers)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:75
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection Data: %(resp)s, %(resp_str)s"
 msgstr ""
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:81
 #, python-format
 msgid "PLUMgrid_NOS_Server Connection RESP: %s"
 msgstr "PLUMgrid_NOS_Server 連線 RESP：%s"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:85
 msgid "PLUMgrid HTTP Connection Failed: "
 msgstr "PLUMgrid HTTP 連線失敗："
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:91
 #, python-format
 msgid "PLUMgrid_NOS_Server: %(action)s failure, %(e)r"
 msgstr "PLUMgrid_NOS_Server：%(action)s 失敗，%(e)r"
 
-#: quantum/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
+#: neutron/plugins/plumgrid/plumgrid_nos_plugin/rest_connection.py:94
 #, python-format
 msgid "PLUMgrid_NOS_Server: status=%(status)d, reason=%(reason)r, ret=%(ret)s"
 msgstr "PLUMgrid_NOS_Server：狀態 = %(status)d，原因 = %(reason)r，ret = %(ret)s"
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:59
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:59
 #, python-format
 msgid "get_ofp_rest_api: %s"
 msgstr "get_ofp_rest_api：%s"
 
-#: quantum/plugins/ryu/ryu_quantum_plugin.py:110
+#: neutron/plugins/ryu/ryu_neutron_plugin.py:110
 msgid "Invalid configuration. check ryu.ini"
 msgstr "無效的配置。請檢查 ryu.ini"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:150
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:150
 #, python-format
 msgid "External port %s"
 msgstr "外部埠 %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:158
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:158
 msgid "Get Ryu rest API address"
 msgstr "取得 Ryu REST API 位址"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:208
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:208
 msgid "Ryu rest API port isn't specified"
 msgstr "未指定 Ryu REST API 埠"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:209
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:209
 #, python-format
 msgid "Going to ofp controller mode %s"
 msgstr "將要 OFP 控制器模式 %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:226
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:226
 msgid "port update received"
 msgstr "收到埠更新"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:259
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:259
 msgid "Agent loop has new device"
 msgstr "代理程式迴圈具有新裝置"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:286
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:286
 #, python-format
 msgid "tunnel_ip %s"
 msgstr "tunnel_ip %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:288
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:288
 #, python-format
 msgid "ovsdb_port %s"
 msgstr "ovsdb_port %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:290
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:290
 #, python-format
 msgid "ovsdb_ip %s"
 msgstr "ovsdb_ip %s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:296
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:296
 #, python-format
 msgid "Initialization failed: %s"
 msgstr "起始設定失敗：%s"
 
-#: quantum/plugins/ryu/agent/ryu_quantum_agent.py:299
+#: neutron/plugins/ryu/agent/ryu_neutron_agent.py:299
 msgid ""
 "Ryu initialization on the node is done. Agent initialized successfully, "
 "now running..."
 msgstr "已完成在節點上起始設定 Ryu。已順利地起始設定代理程式，現正在執行中..."
 
-#: quantum/plugins/ryu/common/config.py:26
+#: neutron/plugins/ryu/common/config.py:26
 msgid "OpenFlow REST API location"
 msgstr "OpenFlow REST API 位置"
 
-#: quantum/plugins/ryu/common/config.py:28
+#: neutron/plugins/ryu/common/config.py:28
 msgid "Minimum tunnel ID to use"
 msgstr "要使用的通道 ID 下限"
 
-#: quantum/plugins/ryu/common/config.py:30
+#: neutron/plugins/ryu/common/config.py:30
 msgid "Maximum tunnel ID to use"
 msgstr "要使用的通道 ID 上限"
 
-#: quantum/plugins/ryu/common/config.py:32
+#: neutron/plugins/ryu/common/config.py:32
 msgid "Tunnel IP to use"
 msgstr "要使用的通道 IP"
 
-#: quantum/plugins/ryu/common/config.py:34
+#: neutron/plugins/ryu/common/config.py:34
 msgid "Tunnel interface to use"
 msgstr "要使用的通道介面"
 
-#: quantum/plugins/ryu/common/config.py:36
+#: neutron/plugins/ryu/common/config.py:36
 msgid "OVSDB port to connect to"
 msgstr "要連接的 OVSDB 埠"
 
-#: quantum/plugins/ryu/common/config.py:38
+#: neutron/plugins/ryu/common/config.py:38
 msgid "OVSDB IP to connect to"
 msgstr "要連接的 OVSDB IP"
 
-#: quantum/plugins/ryu/common/config.py:40
+#: neutron/plugins/ryu/common/config.py:40
 msgid "OVSDB interface to connect to"
 msgstr "要連接的 OVSDB 介面"
 
-#: quantum/plugins/ryu/db/api_v2.py:40
+#: neutron/plugins/ryu/db/api_v2.py:40
 #, python-format
 msgid "get_port_from_device() called:port_id=%s"
 msgstr "已呼叫 get_port_from_device()：port_id = %s"
 
-#: quantum/plugins/ryu/db/api_v2.py:76
+#: neutron/plugins/ryu/db/api_v2.py:76
 #, python-format
 msgid ""
 "Invalid tunnel key options tunnel_key_min: %(key_min)d tunnel_key_max: "
@@ -8296,234 +8300,615 @@ msgstr ""
 "無效的通道索引鍵選項 tunnel_key_min：%(key_min)d 個 tunnel_key_max：%(key_max)d "
 "個。正在使用預設值"
 
-#: quantum/plugins/ryu/db/api_v2.py:156
+#: neutron/plugins/ryu/db/api_v2.py:156
 #, python-format
 msgid "last_key %(last_key)s new_key %(new_key)s"
 msgstr "last_key %(last_key)s new_key %(new_key)s"
 
-#: quantum/plugins/ryu/db/api_v2.py:159
+#: neutron/plugins/ryu/db/api_v2.py:159
 msgid "No key found"
 msgstr "找不到索引鍵"
 
-#: quantum/plugins/ryu/db/api_v2.py:192
+#: neutron/plugins/ryu/db/api_v2.py:192
 #, python-format
 msgid "Transaction retry exhausted (%d). Abandoned tunnel key allocation."
 msgstr "交易重試次數已耗盡（%d 次）。已放棄通道索引鍵配置。"
 
-#: quantum/scheduler/__init__.py:25
+#: neutron/scheduler/__init__.py:25
 msgid "Driver to use for scheduling network to DHCP agent"
 msgstr "用於將網路排程到 DHCP 代理程式的驅動程式"
 
-#: quantum/scheduler/__init__.py:28
+#: neutron/scheduler/__init__.py:28
 msgid "Driver to use for scheduling router to a default L3 agent"
 msgstr "用於將路由器排程到預設 L3 代理程式的驅動程式"
 
-#: quantum/scheduler/__init__.py:31
+#: neutron/scheduler/__init__.py:31
 msgid "Allow auto scheduling networks to DHCP agent."
 msgstr "容許自動將網路排程到 DHCP 代理程式。"
 
-#: quantum/scheduler/__init__.py:33
+#: neutron/scheduler/__init__.py:33
 msgid "Allow auto scheduling routers to L3 agent."
 msgstr "容許自動將路由器排程到 L3 代理程式。"
 
-#: quantum/scheduler/__init__.py:35
+#: neutron/scheduler/__init__.py:35
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:42
+#: neutron/scheduler/dhcp_agent_scheduler.py:42
 #, python-format
 msgid ""
 "Network %(network_id)s is scheduled to be hosted by DHCP agent "
 "%(agent_id)s"
 msgstr "網路 %(network_id)s 已排程為由 DHCP 代理程式 %(agent_id)s 進行管理"
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:60
+#: neutron/scheduler/dhcp_agent_scheduler.py:60
 #, python-format
 msgid "Network %s is hosted already"
 msgstr "網路 %s 已進行管理"
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:69
-#: quantum/scheduler/dhcp_agent_scheduler.py:78
+#: neutron/scheduler/dhcp_agent_scheduler.py:69
+#: neutron/scheduler/dhcp_agent_scheduler.py:78
 msgid "No more DHCP agents"
 msgstr ""
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:101
+#: neutron/scheduler/dhcp_agent_scheduler.py:101
 #, python-format
 msgid "DHCP agent %s is not active"
 msgstr "DHCP 代理程式 %s 不在作用中"
 
-#: quantum/scheduler/dhcp_agent_scheduler.py:108
+#: neutron/scheduler/dhcp_agent_scheduler.py:108
 msgid "No non-hosted networks"
 msgstr "不存在未管理的網路"
 
-#: quantum/scheduler/l3_agent_scheduler.py:56
+#: neutron/scheduler/l3_agent_scheduler.py:56
 #, python-format
 msgid "No enabled L3 agent on host %s"
 msgstr "主機 %s 上不存在已啟用的 L3 代理程式"
 
-#: quantum/scheduler/l3_agent_scheduler.py:61
+#: neutron/scheduler/l3_agent_scheduler.py:61
 #, python-format
 msgid "L3 agent %s is not active"
 msgstr "L3 代理程式 %s 不在作用中"
 
-#: quantum/scheduler/l3_agent_scheduler.py:67
-#: quantum/scheduler/l3_agent_scheduler.py:124
+#: neutron/scheduler/l3_agent_scheduler.py:67
+#: neutron/scheduler/l3_agent_scheduler.py:124
 #, python-format
 msgid "Router %(router_id)s has already been hosted by L3 agent %(agent_id)s"
 msgstr "路由器 %(router_id)s 已由 L3 代理程式 %(agent_id)s 進行管理"
 
-#: quantum/scheduler/l3_agent_scheduler.py:85
+#: neutron/scheduler/l3_agent_scheduler.py:85
 msgid "No non-hosted routers"
 msgstr "不存在未管理的路由器"
 
-#: quantum/scheduler/l3_agent_scheduler.py:99
+#: neutron/scheduler/l3_agent_scheduler.py:99
 #, python-format
 msgid "No routers compatible with L3 agent configuration on host %s"
 msgstr "主機 %s 上不存在與 L3 代理程式配置相容的路由器"
 
-#: quantum/scheduler/l3_agent_scheduler.py:132
+#: neutron/scheduler/l3_agent_scheduler.py:132
 msgid "No active L3 agents"
 msgstr "不存在作用中的 L3 代理程式"
 
-#: quantum/scheduler/l3_agent_scheduler.py:137
+#: neutron/scheduler/l3_agent_scheduler.py:137
 #, python-format
 msgid "No L3 agents can host the router %s"
 msgstr "不存在可以管理路由器 %s 的 L3 代理程式"
 
-#: quantum/scheduler/l3_agent_scheduler.py:146
+#: neutron/scheduler/l3_agent_scheduler.py:146
 #, python-format
 msgid "Router %(router_id)s is scheduled to L3 agent %(agent_id)s"
 msgstr "路由器 %(router_id)s 已排程到 L3 代理程式 %(agent_id)s"
 
-#: quantum/server/__init__.py:34
+#: neutron/server/__init__.py:34
 msgid ""
 "ERROR: Unable to find configuration file via the default search paths "
-"(~/.quantum/, ~/, /etc/quantum/, /etc/) and the '--config-file' option!"
+"(~/.neutron/, ~/, /etc/neutron/, /etc/) and the '--config-file' option!"
 msgstr ""
-"錯誤：無法透過預設搜尋路徑（~/.quantum/、~/、/etc/quantum/ 及 /etc/）與 '--config-file' "
-"選項來找到配置檔！"
 
-#: quantum/server/__init__.py:41
+#: neutron/server/__init__.py:41
 #, python-format
 msgid "ERROR: %s"
 msgstr "錯誤：%s"
 
-#: quantum/services/loadbalancer/plugin.py:34
+#: neutron/services/loadbalancer/plugin.py:34
 msgid "LBaaS driver Fully Qualified Name"
 msgstr ""
 
-#: quantum/services/loadbalancer/plugin.py:65
+#: neutron/services/loadbalancer/plugin.py:66
 #, python-format
 msgid "Error loading LBaaS driver %s"
 msgstr ""
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent.py:35
+#: neutron/services/loadbalancer/drivers/haproxy/agent.py:36
 msgid "Seconds between periodic task runs"
 msgstr "定期執行作業的間隔秒數"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:41
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:41
 msgid "The driver used to manage the loadbalancing device"
 msgstr "用於管理負載平衡裝置的驅動程式"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:46
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:46
 msgid "Location to store config and state files"
 msgstr "配置檔及狀態檔的儲存位置"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:50
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:50
 msgid "The driver used to manage the virtual interface"
 msgstr "用於管理虛擬介面的驅動程式"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:55
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:55
 msgid "The user group"
 msgstr "使用者群組"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:119
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:119
 #, python-format
 msgid "Error importing interface driver: %s"
 msgstr "匯入介面驅動程式時發生錯誤：%s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:132
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:132
 #, python-format
 msgid "Error importing loadbalancer device driver: %s"
 msgstr "匯入負載平衡器裝置驅動程式時發生錯誤：%s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:160
 msgid "Error upating stats"
 msgstr "更新統計資料時發生錯誤"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:181
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:181
 msgid "Unable to retrieve ready devices"
 msgstr "無法擷取備妥的裝置"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:196
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:196
 #, python-format
 msgid "Unable to refresh device for pool: %s"
 msgstr "無法重新整理儲存區的裝置：%s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/agent_manager.py:207
+#: neutron/services/loadbalancer/drivers/haproxy/agent_manager.py:207
 #, python-format
 msgid "Unable to destroy device for pool: %s"
 msgstr "無法毀損儲存區的裝置：%s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:123
 #, python-format
 msgid "Error while connecting to stats socket: %s"
 msgstr "連接至統計資料 Socket 時發生錯誤：%s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:126
 #, python-format
 msgid "Stats socket not found for pool %s"
 msgstr "找不到儲存區 %s 的統計資料 Socket"
 
-#: quantum/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
+#: neutron/services/loadbalancer/drivers/haproxy/namespace_driver.py:216
 #, python-format
 msgid "Unable to kill haproxy process: %s"
 msgstr "無法結束 haproxy 處理程序：%s"
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:91
 msgid "Expected active pool and vip"
 msgstr "需要作用中的儲存區及 VIP"
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:136
 #, python-format
 msgid "Unable to find port %s to plug."
 msgstr "找不到要插入的埠 %s。"
 
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
-#: quantum/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:160
+#: neutron/services/loadbalancer/drivers/haproxy/plugin_driver.py:177
 #, python-format
 msgid ""
 "Unable to find port %s to unplug.  This can occur when the Vip has been "
 "deleted first."
 msgstr "找不到要拔除的埠 %s。如果先刪除 VIP，則可能會發生此情況。"
 
-#: quantum/services/loadbalancer/drivers/noop/noop_driver.py:31
+#: neutron/services/loadbalancer/drivers/noop/noop_driver.py:31
 #, python-format
 msgid ""
 "NoopLbaaSDriver method %(method_name)scalled with arguments %(args)s "
 "%(kwargs)s "
 msgstr ""
 
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
-#: quantum/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:180
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:204
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:225
+#: neutron/tests/unit/db/loadbalancer/test_db_loadbalancer.py:250
 #, python-format
 msgid "Unexpected error code: %s"
 msgstr ""
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:375
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:375
 #, python-format
 msgid "lswitch:%s not found"
 msgstr "找不到 lswitch：%s"
 
-#: quantum/tests/unit/nicira/fake_nvpapiclient.py:384
+#: neutron/tests/unit/nicira/fake_nvpapiclient.py:384
 #, python-format
 msgid "lrouter:%s not found"
 msgstr "找不到 lrouter：%s"
 
+#~ msgid "Quantum core_plugin not configured!"
+#~ msgstr "未配置 Quantum core_plugin！"
+
+#~ msgid ""
+#~ "Plugin not found.  You can install "
+#~ "a plugin with: pip install <plugin-"
+#~ "name>\n"
+#~ "Example: pip install quantum-sample-plugin"
+#~ msgstr ""
+#~ "找不到外掛程式。可以使用下列指令來安裝外掛程式：pip install <plugin-name>\n"
+#~ "範例：pip install quantum-sample-plugin"
+
+#~ msgid "In WsgiService.create()"
+#~ msgstr "在 WsgiService.create() 中"
+
+#~ msgid "Quantum service started, listening on %(host)s:%(port)s"
+#~ msgstr "Quantum 服務已啟動，正在 %(host)s:%(port)s 上進行接聽"
+
+#~ msgid ""
+#~ "Quantum server does not support state"
+#~ " report. State report for this agent"
+#~ " will be disabled."
+#~ msgstr "Quantum 伺服器不支援狀態報告。將停用此代理程式的狀態報告。"
+
+#~ msgid "TCP Port used by Quantum metadata namespace proxy."
+#~ msgstr "Quantum meta 資料名稱空間 Proxy 所使用的 TCP 埠。"
+
+#~ msgid ""
+#~ "The 'gateway_external_network_id' option must "
+#~ "be configured for this agent as "
+#~ "Quantum has more than one external "
+#~ "network."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "True to delete all ports on all"
+#~ " the OpenvSwitch bridges. False to "
+#~ "delete ports created by Quantum on "
+#~ "integration and external network bridges."
+#~ msgstr ""
+#~ "如果為 True，則刪除所有 OpenvSwitch 橋接器上的所有埠。如果為 "
+#~ "False，則刪除 Quantum 在整合及外部網路橋接器上建立的埠。"
+
+#~ msgid "The core plugin Quantum will use"
+#~ msgstr "Quantum 將使用的核心外掛程式"
+
+#~ msgid "The service plugins Quantum will use"
+#~ msgstr "Quantum 將使用的服務外掛程式"
+
+#~ msgid "The base MAC address Quantum will use for VIFs"
+#~ msgstr "Quantum 將用於 VIF 的基本 MAC 位址"
+
+#~ msgid "How many times Quantum will retry MAC generation"
+#~ msgstr "Quantum 將重試 MAC 產生作業的次數"
+
+#~ msgid "Allow overlapping IP support in Quantum"
+#~ msgstr "容許 Quantum 中的重疊 IP 支援"
+
+#~ msgid "The hostname Quantum is running on"
+#~ msgstr "Quantum 正在其中執行的主機名稱"
+
+#~ msgid ""
+#~ "Default service type record updated in"
+#~ " Quantum database. identifier is '%s'"
+#~ msgstr "在 Quantum 資料庫中更新了預設服務類型記錄。ID 為 '%s'"
+
+#~ msgid "Quantum plugin provider module"
+#~ msgstr "Quantum 外掛程式提供者模組"
+
+#~ msgid "Quantum quota driver class"
+#~ msgstr "Quantum 配額驅動程式類別"
+
+#~ msgid ""
+#~ "You must provide a config file for"
+#~ " bridge - either --config-file or "
+#~ "env[QUANTUM_TEST_CONFIG_FILE]"
+#~ msgstr "必須為橋接器提供配置檔：--config-file，或 env[QUANTUM_TEST_CONFIG_FILE]"
+
+#~ msgid "Quantum Service Type Management"
+#~ msgstr "Quantum 服務類型管理"
+
+#~ msgid ""
+#~ "API for retrieving and managing service"
+#~ " types for Quantum advanced services"
+#~ msgstr "用於擷取及管理 Quantum 進階服務之服務類型的 API"
+
+#~ msgid "User defined identifier for this Quantum deployment"
+#~ msgstr "此 Quantum 部署的使用者定義 ID"
+
+#~ msgid "QuantumRestProxy: Starting plugin. Version=%s"
+#~ msgstr "QuantumRestProxy：正在啟動外掛程式。版本 = %s"
+
+#~ msgid "QuantumRestProxyV2: initialization done"
+#~ msgstr "QuantumRestProxyV2：已完成起始設定"
+
+#~ msgid "QuantumRestProxyV2: create_network() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 create_network()"
+
+#~ msgid "QuantumRestProxyV2:Unable to create remote network: %s"
+#~ msgstr "QuantumRestProxyV2：無法建立遠端網路：%s"
+
+#~ msgid "QuantumRestProxyV2.update_network() called"
+#~ msgstr "已呼叫 QuantumRestProxyV2.update_network()"
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote network: %s"
+#~ msgstr "QuantumRestProxyV2：無法更新遠端網路：%s"
+
+#~ msgid "QuantumRestProxyV2: delete_network() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 delete_network()"
+
+#~ msgid "QuantumRestProxyV2: create_port() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 create_port()"
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote port: %s"
+#~ msgstr "QuantumRestProxyV2：無法建立遠端埠：%s"
+
+#~ msgid "QuantumRestProxyV2: update_port() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 update_port()"
+
+#~ msgid "QuantumRestProxyV2: delete_port() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 delete_port()"
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote port: %s"
+#~ msgstr "QuantumRestProxyV2：無法更新遠端埠：%s"
+
+#~ msgid "QuantumRestProxyV2: _plug_interface() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 _plug_interface()"
+
+#~ msgid "QuantumRestProxyV2:Unable to update remote network: %s"
+#~ msgstr "QuantumRestProxyV2：無法更新遠端網路：%s"
+
+#~ msgid "QuantumRestProxyV2: _unplug_interface() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 _unplug_interface()"
+
+#~ msgid "QuantumRestProxyV2: create_subnet() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 create_subnet()"
+
+#~ msgid "QuantumRestProxyV2: update_subnet() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 update_subnet()"
+
+#~ msgid "QuantumRestProxyV2: delete_subnet() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 delete_subnet()"
+
+#~ msgid "QuantumRestProxyV2: create_router() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 create_router()"
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote router: %s"
+#~ msgstr "QuantumRestProxyV2：無法建立遠端路由器：%s"
+
+#~ msgid "QuantumRestProxyV2.update_router() called"
+#~ msgstr "已呼叫 QuantumRestProxyV2.update_router()"
+
+#~ msgid "QuantumRestProxyV2: Unable to update remote router: %s"
+#~ msgstr "QuantumRestProxyV2：無法更新遠端路由器：%s"
+
+#~ msgid "QuantumRestProxyV2: delete_router() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 delete_router()"
+
+#~ msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
+#~ msgstr "QuantumRestProxyV2：無法刪除遠端路由器：%s"
+
+#~ msgid "QuantumRestProxyV2: add_router_interface() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 add_router_interface()"
+
+#~ msgid "QuantumRestProxyV2: Unable to create interface: %s"
+#~ msgstr "QuantumRestProxyV2：無法建立介面：%s"
+
+#~ msgid "QuantumRestProxyV2: remove_router_interface() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 remove_router_interface()"
+
+#~ msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
+#~ msgstr "QuantumRestProxyV2：無法刪除遠端介面：%s"
+
+#~ msgid "QuantumRestProxyV2: create_floatingip() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 create_floatingip()"
+
+#~ msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
+#~ msgstr "QuantumRestProxyV2：無法建立遠端浮動 IP：%s"
+
+#~ msgid "QuantumRestProxyV2: update_floatingip() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 update_floatingip()"
+
+#~ msgid "QuantumRestProxyV2: delete_floatingip() called"
+#~ msgstr "QuantumRestProxyV2：已呼叫 delete_floatingip()"
+
+#~ msgid "QuantumRestProxy: Unable to update remote topology: %s"
+#~ msgstr "QuantumRestProxy：無法更新遠端拓蹼：%s"
+
+#~ msgid "Failed to delete quantum db, while Midonet bridge=%rhad been deleted"
+#~ msgstr "在已刪除 Midonet 橋接器 = %r 時，無法刪除 Quantum DB"
+
+#~ msgid ""
+#~ "List of network type driver entrypoints"
+#~ " to be loaded from the "
+#~ "quantum.ml2.type_drivers namespace."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "List of networking mechanism driver "
+#~ "entrypoints to be loaded from the "
+#~ "quantum.ml2.mechanism_drivers namespace."
+#~ msgstr ""
+
+#~ msgid "Device with mac_address %s not defined on Quantum Plugin"
+#~ msgstr ""
+
+#~ msgid "Consistency of Quantum-OFC resource map is broken: %(reason)s"
+#~ msgstr "Quantum-OFC 資源對映的一致性已損毀：%(reason)s"
+
+#~ msgid "NotFound %(resource)s for quantum_id=%(id)s."
+#~ msgstr "quantum_id = %(id)s 的 %(resource)s NotFound。"
+
+#~ 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 建立邏輯路由器埠"
+
+#~ 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"
+
+#~ 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 ""
+#~ "無法將連接裝置插入路由器 %(router_id)s 上 Quantum 埠 "
+#~ "ID %(q_port_id)s 的路由器埠 %(r_port_id)s"
+
+#~ msgid "Unable to find NVP uuid for Quantum port %s"
+#~ msgstr "找不到 Quantum 埠 %s 的 NVP UUID"
+
+#~ msgid "A nvp lport identifier was not found for quantum port '%s'"
+#~ msgstr "找不到 Quantum 埠 '%s' 的 NVP lport ID"
+
+#~ 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"
+
+#~ msgid "Logical Switch %s found in quantum database but not in NVP."
+#~ msgstr "邏輯交換器 %s 位在 Quantum 資料庫中，但不在 NVP 中。"
+
+#~ msgid ""
+#~ "Found %s logical switches not bound "
+#~ "to Quantum networks. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr "發現有 %s 個邏輯交換器未連結至 Quantum 網路。Quantum 與 NVP 可能不同步"
+
+#~ msgid "Quantum logical port %s was not found on NVP"
+#~ msgstr "在 NVP 上找不到 Quantum 邏輯埠 %s"
+
+#~ msgid ""
+#~ "Found %s logical ports not bound "
+#~ "to Quantum ports. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr "發現有 %s 個邏輯埠未連結至 Quantum 埠。Quantum 與 NVP 可能不同步"
+
+#~ 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"
+
+#~ msgid ""
+#~ "Found %s logical routers not bound "
+#~ "to Quantum routers. Quantum and NVP "
+#~ "are potentially out of sync"
+#~ msgstr "發現有 %s 個邏輯路由器未連結至 Quantum 路由器。Quantum 與 NVP 可能不同步"
+
+#~ 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 邏輯路由器埠。此埠是否曾與邏輯路由器配對？"
+
+#~ msgid ""
+#~ "Looking for port with q_port_id tag "
+#~ "'%(quantum_port_id)s' on: '%(lswitch_uuid)s'"
+#~ msgstr "正在 '%(lswitch_uuid)s' 上尋找 q_port_id 標籤為 '%(quantum_port_id)s' 的埠"
+
+#~ msgid ""
+#~ "Found '%(num_ports)d' ports with q_port_id "
+#~ "tag: '%(quantum_port_id)s'. Only 1 was "
+#~ "expected."
+#~ msgstr "找到 '%(num_ports)d' 個 q_port_id 標籤為 '%(quantum_port_id)s' 的埠。只需要 1 個。"
+
+#~ msgid ""
+#~ "If set to access_network this enables"
+#~ " a dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router. If set "
+#~ "to dhcp_host_route this enables host "
+#~ "route injection via the dhcp agent. "
+#~ "This option is only useful if "
+#~ "running on a host that does not"
+#~ " support namespaces otherwise access_network "
+#~ "should be used."
+#~ msgstr ""
+
+#~ msgid ""
+#~ "Enables dedicated connection to the "
+#~ "metadata proxy for metadata server "
+#~ "access via Quantum router"
+#~ msgstr "啟用 meta 資料 Proxy 的專用連線，以透過 Quantum 路由器來存取 meta 資料伺服器"
+
+#~ msgid ""
+#~ "This is uuid of the default NVP"
+#~ " Transport zone that will be used "
+#~ "for creating tunneled isolated \"Quantum\" "
+#~ "networks. It needs to be created "
+#~ "in NVP before starting Quantum with "
+#~ "the nvp plugin."
+#~ msgstr ""
+#~ "這是將用於建立通道隔離 \"Quantum\" 網路的預設「NVP 傳輸」區域 "
+#~ "UUID。它必須在 NVP 中建立，才能使用 NVP 外掛程式來啟動 "
+#~ "Quantum。"
+
+#~ msgid ""
+#~ "Network Gateway '%(gateway_id)s' still has "
+#~ "active mappings with one or more "
+#~ "quantum networks."
+#~ msgstr "網路閘道 '%(gateway_id)s' 仍具有內含一個以上 Quantum 網路的作用中對映。"
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS Body Data Creation"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：建立 NOS 主體資料"
+
+#~ msgid "QuantumPluginPLUMgrid Status: Starting Plugin"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：正在啟動外掛程式"
+
+#~ msgid "QuantumPluginPLUMgrid Status: Aborting Plugin"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：正在中止外掛程式"
+
+#~ msgid "QuantumPluginPLUMgrid NOS: %s"
+#~ msgstr "QuantumPluginPLUMgrid NOS：%s"
+
+#~ msgid "QuantumPluginPLUMgrid Status: NOS value is missing in config file"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：配置檔中遺漏了 NOS 值"
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: Quantum server "
+#~ "with PLUMgrid Plugin has started"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：已啟動含有 PLUMgrid 外掛程式的 Quantum 伺服器"
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_network() called"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 create_network()"
+
+#~ msgid ""
+#~ "QuantumPluginPLUMgrid Status: %(tenant_id)s, "
+#~ "%(network)s, %(network_id)s"
+#~ msgstr ""
+
+#~ msgid "QuantumPluginPLUMgridV2.update_network() called"
+#~ msgstr "已呼叫 QuantumPluginPLUMgridV2.update_network()"
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_network() called"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 delete_network()"
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_port() called"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 create_port()"
+
+#~ msgid "QuantumPluginPLUMgrid Status: update_port() called"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 update_port()"
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_port() called"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 delete_port()"
+
+#~ msgid "QuantumPluginPLUMgrid Status: create_subnet() called"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 create_subnet()"
+
+#~ msgid "QuantumPluginPLUMgrid Status: delete_subnet() called"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：已呼叫 delete_subnet()"
+
+#~ msgid "QuantumPluginPLUMgrid Status: REST Connection Started"
+#~ msgstr "QuantumPluginPLUMgrid 狀態：已開始 REST 連線"
+
 #~ msgid ""
-#~ "MidonetPluginV2.get_networks called: filters=%(filters)r,"
-#~ " fields=%(fields)r"
-#~ msgstr "已呼叫 MidonetPluginV2.get_networks：過濾器 = %(filters)r，欄位 = %(fields)r"
+#~ "ERROR: Unable to find configuration file"
+#~ " via the default search paths "
+#~ "(~/.quantum/, ~/, /etc/quantum/, /etc/) and"
+#~ " the '--config-file' option!"
+#~ msgstr ""
+#~ "錯誤：無法透過預設搜尋路徑（~/.quantum/、~/、/etc/quantum/ 及 /etc/）與 "
+#~ "'--config-file' 選項來找到配置檔！"