diff --git a/neutron/locale/es/LC_MESSAGES/neutron-log-info.po b/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
index 8a25eedf79e..011d2bf97a4 100644
--- a/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
@@ -3,13 +3,14 @@
 # This file is distributed under the same license as the neutron project.
 #
 # Translators:
+# Pablo Sanchez <furybeat@gmail.com>, 2015
 msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-11 06:09+0000\n"
-"PO-Revision-Date: 2015-07-08 20:45+0000\n"
-"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
+"POT-Creation-Date: 2015-07-16 06:09+0000\n"
+"PO-Revision-Date: 2015-07-14 07:33+0000\n"
+"Last-Translator: Pablo Sanchez <furybeat@gmail.com>\n"
 "Language-Team: Spanish (http://www.transifex.com/p/neutron/language/es/)\n"
 "Language: es\n"
 "MIME-Version: 1.0\n"
@@ -71,6 +72,10 @@ msgstr "Se ha intentado eliminar el filtro de puerto que no está filtrado %r"
 msgid "Attempted to update port filter which is not filtered %s"
 msgstr "Se ha intentado actualizar el filtro de puerto que no está filtrado %s"
 
+#, python-format
+msgid "Cleaning bridge: %s"
+msgstr "LImpiando puente: %s"
+
 #, python-format
 msgid "Config paste file: %s"
 msgstr "Archivo de configuración de pegar: %s"
@@ -78,6 +83,14 @@ msgstr "Archivo de configuración de pegar: %s"
 msgid "DHCP agent started"
 msgstr "Se ha iniciado al agente DHCP"
 
+#, python-format
+msgid "Deleting port: %s"
+msgstr "Destruyendo puerto: %s"
+
+#, python-format
+msgid "Destroying IPset: %s"
+msgstr "Destruyendo IPset: %s"
+
 #, python-format
 msgid "Device %s already exists"
 msgstr "El dispositivo %s ya existe"
@@ -153,6 +166,9 @@ msgstr "Rangos de VLAN de red: %s"
 msgid "No %s Plugin loaded"
 msgstr "No se ha cargado ningún plug-in de %s"
 
+msgid "No ports here to refresh firewall"
+msgstr "No hay puertos aqui para actualizar firewall"
+
 msgid "OVS cleanup completed successfully"
 msgstr "La limpieza de OVS se ha completado satisfactoriamente"
 
@@ -186,6 +202,13 @@ msgstr "Renovar reglas de cortafuegos"
 msgid "Remove device filter for %r"
 msgstr "Eliminar filtro de dispositivo para %r"
 
+#, python-format
+msgid ""
+"Router %s is not managed by this agent. It was possibly deleted concurrently."
+msgstr ""
+"Router %s no es controlado por este agente.Fue posiblemente borrado "
+"concurrentemente"
+
 #, python-format
 msgid "Security group member updated %r"
 msgstr "Se ha actualizado el miembro de grupo de seguridad %r"
@@ -210,6 +233,9 @@ msgstr ""
 msgid "Synchronizing state"
 msgstr "Sincronizando estado"
 
+msgid "Synchronizing state complete"
+msgstr "Sincronizando estado completado"
+
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
diff --git a/neutron/locale/neutron-log-error.pot b/neutron/locale/neutron-log-error.pot
index cb372da55d7..92601284b73 100644
--- a/neutron/locale/neutron-log-error.pot
+++ b/neutron/locale/neutron-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 7.0.0.0b2.dev192\n"
+"Project-Id-Version: neutron 7.0.0.0b2.dev267\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-11 06:09+0000\n"
+"POT-Creation-Date: 2015-07-16 06:09+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"
@@ -86,11 +86,20 @@ msgstr ""
 msgid "Timed out retrieving ofport on port %(pname)s. Exception: %(exception)s"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:566
+#: neutron/agent/common/ovs_lib.py:570
 #, python-format
 msgid "OVS flows could not be applied on bridge %s"
 msgstr ""
 
+#: neutron/agent/common/utils.py:38 neutron/agent/l3/agent.py:228
+msgid "An interface driver must be specified"
+msgstr ""
+
+#: neutron/agent/common/utils.py:43
+#, python-format
+msgid "Error importing interface driver '%(driver)s': %(inner)s"
+msgstr ""
+
 #: neutron/agent/dhcp/agent.py:137
 #, python-format
 msgid "Unable to %(action)s dhcp for %(net_id)s."
@@ -110,89 +119,80 @@ msgstr ""
 msgid "Network %s info call failed."
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:577 neutron/agent/l3/agent.py:640
+#: neutron/agent/dhcp/agent.py:577 neutron/agent/l3/agent.py:632
 #: neutron/agent/metadata/agent.py:315
 #: neutron/plugins/hyperv/agent/l2_agent.py:94
 #: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:109
 #: neutron/plugins/ml2/drivers/linuxbridge/agent/linuxbridge_neutron_agent.py:814
 #: neutron/plugins/ml2/drivers/mech_sriov/agent/sriov_nic_agent.py:130
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:311
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:314
 #: neutron/services/metering/agents/metering_agent.py:283
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:174 neutron/tests/unit/agent/l3/test_agent.py:1865
-#, python-format
-msgid "Error importing interface driver '%s'"
-msgstr ""
-
-#: neutron/agent/l3/agent.py:236 neutron/agent/linux/dhcp.py:923
-msgid "An interface driver must be specified"
-msgstr ""
-
-#: neutron/agent/l3/agent.py:241
+#: neutron/agent/l3/agent.py:233
 msgid "Router id is required if not using namespaces."
 msgstr ""
 
-#: neutron/agent/l3/agent.py:248
+#: neutron/agent/l3/agent.py:240
 #, python-format
 msgid "%s used in config as ipv6_gateway is not a valid IPv6 link-local address."
 msgstr ""
 
-#: neutron/agent/l3/agent.py:333
+#: neutron/agent/l3/agent.py:325
 #, python-format
 msgid "Error while deleting router %s"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:403
+#: neutron/agent/l3/agent.py:395
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:458
+#: neutron/agent/l3/agent.py:450
 #, python-format
 msgid "Failed to fetch router information for '%s'"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:487
+#: neutron/agent/l3/agent.py:479
 #, python-format
 msgid "Removing incompatible router '%s'"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:491
+#: neutron/agent/l3/agent.py:483
 #, python-format
 msgid "Failed to process compatible router '%s'"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:543
+#: neutron/agent/l3/agent.py:535
 msgid "Failed synchronizing routers due to RPC error"
 msgstr ""
 
-#: neutron/agent/l3/dvr_local_router.py:188
+#: neutron/agent/l3/dvr_local_router.py:181
 msgid "DVR: Failed updating arp entry"
 msgstr ""
 
-#: neutron/agent/l3/dvr_local_router.py:213
-msgid "DVR: no map match_port found!"
-msgstr ""
-
-#: neutron/agent/l3/dvr_local_router.py:281
+#: neutron/agent/l3/dvr_local_router.py:263
 msgid "DVR: error adding redirection logic"
 msgstr ""
 
-#: neutron/agent/l3/dvr_local_router.py:283
+#: neutron/agent/l3/dvr_local_router.py:265
 msgid "DVR: removed snat failed"
 msgstr ""
 
-#: neutron/agent/l3/dvr_local_router.py:435
+#: neutron/agent/l3/dvr_local_router.py:387
 #, python-format
 msgid "No FloatingIP agent gateway port returned from server for 'network-id': %s"
 msgstr ""
 
-#: neutron/agent/l3/dvr_local_router.py:440
+#: neutron/agent/l3/dvr_local_router.py:392
 msgid "Missing subnet/agent_gateway_port"
 msgstr ""
 
+#: neutron/agent/l3/dvr_router_base.py:42
+msgid "DVR: no map match_port found!"
+msgstr ""
+
 #: neutron/agent/l3/ha_router.py:74
 #, python-format
 msgid "Error while writing HA state for %s"
@@ -208,11 +208,11 @@ msgstr ""
 msgid "Failed to process or handle event for line %s"
 msgstr ""
 
-#: neutron/agent/l3/namespace_manager.py:114
+#: neutron/agent/l3/namespace_manager.py:121
 msgid "RuntimeError in obtaining namespace list for namespace cleanup."
 msgstr ""
 
-#: neutron/agent/l3/namespace_manager.py:138
+#: neutron/agent/l3/namespace_manager.py:142
 #, python-format
 msgid "Failed to destroy stale namespace %s"
 msgstr ""
@@ -246,11 +246,6 @@ msgstr ""
 msgid "Pidfile %s already exist. Daemon already running?"
 msgstr ""
 
-#: neutron/agent/linux/dhcp.py:929
-#, python-format
-msgid "Error importing interface driver '%(driver)s': %(inner)s"
-msgstr ""
-
 #: neutron/agent/linux/external_process.py:224
 #, python-format
 msgid ""
@@ -303,7 +298,7 @@ msgstr ""
 msgid "Exceeded %s second limit waiting for address to leave the tentative state."
 msgstr ""
 
-#: neutron/agent/linux/ip_lib.py:799
+#: neutron/agent/linux/ip_lib.py:806
 #, python-format
 msgid "Failed sending gratuitous ARP to %(addr)s on %(iface)s in namespace %(ns)s"
 msgstr ""
@@ -570,7 +565,7 @@ msgstr ""
 msgid "Exception encountered during network rescheduling"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:217 neutron/plugins/ml2/plugin.py:569
+#: neutron/db/db_base_plugin_v2.py:217 neutron/plugins/ml2/plugin.py:562
 #, python-format
 msgid "An exception occurred while creating the %(resource)s:%(item)s"
 msgstr ""
@@ -590,6 +585,16 @@ msgstr ""
 msgid "Could not retrieve gateway port for subnet %s"
 msgstr ""
 
+#: neutron/db/ipam_pluggable_backend.py:63
+#, python-format
+msgid "IP deallocation failed on external system for %s"
+msgstr ""
+
+#: neutron/db/ipam_pluggable_backend.py:126
+#, python-format
+msgid "IP allocation failed on external system for %s"
+msgstr ""
+
 #: neutron/db/l3_agentschedulers_db.py:118
 #, python-format
 msgid "Failed to reschedule router %s"
@@ -599,7 +604,11 @@ msgstr ""
 msgid "Exception encountered during router rescheduling."
 msgstr ""
 
-#: neutron/db/l3_db.py:542
+#: neutron/db/l3_db.py:517
+msgid "Router port must have at least one fixed IP"
+msgstr ""
+
+#: neutron/db/l3_db.py:546
 msgid "Cannot have multiple IPv4 subnets on router port"
 msgstr ""
 
@@ -630,10 +639,10 @@ msgstr ""
 msgid "Error response returned from nova: %s"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:296
-#: neutron/plugins/brocade/NeutronPlugin.py:340
-#: neutron/plugins/brocade/NeutronPlugin.py:393
-#: neutron/plugins/brocade/NeutronPlugin.py:423
+#: neutron/plugins/brocade/NeutronPlugin.py:295
+#: neutron/plugins/brocade/NeutronPlugin.py:339
+#: neutron/plugins/brocade/NeutronPlugin.py:392
+#: neutron/plugins/brocade/NeutronPlugin.py:422
 msgid "Brocade NOS driver error"
 msgstr ""
 
@@ -721,13 +730,13 @@ msgid ""
 msgstr ""
 
 #: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:256
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1701
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1713
 #, python-format
 msgid "%s Agent terminated!"
 msgstr ""
 
 #: neutron/plugins/ml2/db.py:242 neutron/plugins/ml2/db.py:326
-#: neutron/plugins/ml2/plugin.py:1344
+#: neutron/plugins/ml2/plugin.py:1360
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
@@ -786,102 +795,107 @@ msgstr ""
 msgid "Extension driver '%(name)s' failed in %(method)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:287
+#: neutron/plugins/ml2/plugin.py:286
 #, python-format
 msgid "Failed to commit binding results for %(port)s after %(max)s tries"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:449
+#: neutron/plugins/ml2/plugin.py:442
 #, python-format
 msgid "Serialized vif_details DB value '%(value)s' for port %(port)s is invalid"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:460
+#: neutron/plugins/ml2/plugin.py:453
 #, python-format
 msgid "Serialized profile DB value '%(value)s' for port %(port)s is invalid"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:546
+#: neutron/plugins/ml2/plugin.py:539
 #, python-format
 msgid "Could not find %s to delete."
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:549
+#: neutron/plugins/ml2/plugin.py:542
 #, python-format
 msgid "Could not delete %(res)s %(id)s."
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:582
+#: neutron/plugins/ml2/plugin.py:575
 #, python-format
 msgid ""
 "mechanism_manager.create_%(res)s_postcommit failed for %(res)s: "
 "'%(failed_id)s'. Deleting %(res)ss %(resource_ids)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:628
+#: neutron/plugins/ml2/plugin.py:621
 #, python-format
 msgid "mechanism_manager.create_network_postcommit failed, deleting network '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:698
+#: neutron/plugins/ml2/plugin.py:691
 #, python-format
 msgid "Exception auto-deleting port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:711
+#: neutron/plugins/ml2/plugin.py:704
 #, python-format
 msgid "Exception auto-deleting subnet %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:793
+#: neutron/plugins/ml2/plugin.py:785
 msgid "mechanism_manager.delete_network_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:814
+#: neutron/plugins/ml2/plugin.py:806
 #, python-format
 msgid "mechanism_manager.create_subnet_postcommit failed, deleting subnet '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:937
+#: neutron/plugins/ml2/plugin.py:924
 #, python-format
 msgid "Exception deleting fixed_ip from port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:946
+#: neutron/plugins/ml2/plugin.py:933
 msgid "mechanism_manager.delete_subnet_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1011
+#: neutron/plugins/ml2/plugin.py:998
 #, python-format
 msgid "mechanism_manager.create_port_postcommit failed, deleting port '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1023
+#: neutron/plugins/ml2/plugin.py:1010
 #, python-format
 msgid "_bind_port_if_needed failed, deleting port '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1054
+#: neutron/plugins/ml2/plugin.py:1041
 #, python-format
 msgid "_bind_port_if_needed failed. Deleting all ports from create bulk '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1201
+#: neutron/plugins/ml2/plugin.py:1175
+#, python-format
+msgid "mechanism_manager.update_port_postcommit failed for port %s"
+msgstr ""
+
+#: neutron/plugins/ml2/plugin.py:1222
 #, python-format
 msgid "No Host supplied to bind DVR Port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1325
+#: neutron/plugins/ml2/plugin.py:1341
 #, python-format
 msgid "mechanism_manager.delete_port_postcommit failed for port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1357
+#: neutron/plugins/ml2/plugin.py:1373
 #, python-format
 msgid "Binding info for DVR port %s not found"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_gre.py:82
+#: neutron/plugins/ml2/drivers/type_gre.py:79
 msgid "Failed to parse tunnel_id_ranges. Service terminated!"
 msgstr ""
 
@@ -889,7 +903,7 @@ msgstr ""
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:85
+#: neutron/plugins/ml2/drivers/type_vxlan.py:83
 msgid "Failed to parse vni_ranges. Service terminated!"
 msgstr ""
 
@@ -1035,106 +1049,106 @@ msgid ""
 "a different subnet %(orig_subnet)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:410
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:413
 msgid "No tunnel_type specified, cannot create tunnels"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:413
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:436
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:416
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:439
 #, python-format
 msgid "tunnel_type %s not supported by agent"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:429
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:432
 msgid "No tunnel_ip specified, cannot delete tunnels"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:433
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:436
 msgid "No tunnel_type specified, cannot delete tunnels"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:579
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:582
 #, python-format
 msgid "No local VLAN available for net-id=%s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:610
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:613
 #, python-format
 msgid ""
 "Cannot provision %(network_type)s network for net-id=%(net_uuid)s - "
 "tunneling disabled"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:618
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:621
 #, python-format
 msgid ""
 "Cannot provision flat network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:628
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:631
 #, python-format
 msgid ""
 "Cannot provision VLAN network for net-id=%(net_uuid)s - no bridge for "
 "physical_network %(physical_network)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:637
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:640
 #, python-format
 msgid ""
 "Cannot provision unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:697
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:700
 #, python-format
 msgid ""
 "Cannot reclaim unknown network type %(network_type)s for net-"
 "id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:904
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:907
 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 ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:963
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:966
 #, python-format
 msgid ""
 "Bridge %(bridge)s for physical network %(physical_network)s does not "
 "exist. Agent terminated!"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1152
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1155
 #, python-format
 msgid "Failed to set-up %(type)s tunnel port to %(ip)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1344
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1347
 #, python-format
 msgid ""
 "process_network_ports - iteration:%d - failure while retrieving port "
 "details from server"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1380
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1383
 #, python-format
 msgid ""
 "process_ancillary_network_ports - iteration:%d - failure while retrieving"
 " port details from server"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1522
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1525
 msgid "Error while synchronizing tunnels"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1598
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1601
 msgid "Error while processing VIF ports"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1695
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1707
 msgid "Agent failed to create agent config map"
 msgstr ""
 
diff --git a/neutron/locale/neutron-log-warning.pot b/neutron/locale/neutron-log-warning.pot
index c4fb722550c..321d4defd4f 100644
--- a/neutron/locale/neutron-log-warning.pot
+++ b/neutron/locale/neutron-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 7.0.0.0b2.dev192\n"
+"Project-Id-Version: neutron 7.0.0.0b2.dev267\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-11 06:09+0000\n"
+"POT-Creation-Date: 2015-07-16 06:09+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"
@@ -59,17 +59,17 @@ msgid ""
 "falling back to old security_group_rules_for_devices which scales worse."
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:373
+#: neutron/agent/common/ovs_lib.py:377
 #, python-format
 msgid "Found not yet ready openvswitch port: %s"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:376
+#: neutron/agent/common/ovs_lib.py:380
 #, python-format
 msgid "Found failed openvswitch port: %s"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:438
+#: neutron/agent/common/ovs_lib.py:442
 #, python-format
 msgid "ofport: %(ofport)s for VIF: %(vif)s is not a positive integer"
 msgstr ""
@@ -101,7 +101,7 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:571 neutron/agent/l3/agent.py:635
+#: neutron/agent/dhcp/agent.py:571 neutron/agent/l3/agent.py:627
 #: neutron/agent/metadata/agent.py:310
 #: neutron/services/metering/agents/metering_agent.py:278
 msgid ""
@@ -109,7 +109,7 @@ msgid ""
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/l3/agent.py:194
+#: neutron/agent/l3/agent.py:186
 #, python-format
 msgid ""
 "l3-agent cannot check service plugins enabled at the neutron server when "
@@ -118,14 +118,14 @@ msgid ""
 "warning. Detail message: %s"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:206
+#: neutron/agent/l3/agent.py:198
 #, python-format
 msgid ""
 "l3-agent cannot check service plugins enabled on the neutron server. "
 "Retrying. Detail message: %s"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:341
+#: neutron/agent/l3/agent.py:333
 #, python-format
 msgid "Info for router %s was not found. Performing router cleanup"
 msgstr ""
@@ -349,18 +349,18 @@ msgstr ""
 msgid "Could not expand segment %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:530
+#: neutron/plugins/ml2/plugin.py:523
 #, python-format
 msgid ""
 "In _notify_port_updated(), no bound segment for port %(port_id)s on "
 "network %(network_id)s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:781
+#: neutron/plugins/ml2/plugin.py:773
 msgid "A concurrent port creation has occurred"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1435
+#: neutron/plugins/ml2/plugin.py:1445
 #, python-format
 msgid "Port %s not found during update"
 msgstr ""
@@ -388,16 +388,12 @@ msgstr ""
 msgid "No flat network found on physical network %s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_gre.py:102
-msgid "Gre allocations were already created."
-msgstr ""
-
-#: neutron/plugins/ml2/drivers/type_tunnel.py:179
+#: neutron/plugins/ml2/drivers/type_tunnel.py:225
 #, python-format
 msgid "%(type)s tunnel %(id)s not found"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:236
+#: neutron/plugins/ml2/drivers/type_tunnel.py:282
 #, python-format
 msgid "Endpoint with ip %s already exists"
 msgstr ""
@@ -524,38 +520,38 @@ msgid ""
 "message: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:531
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:534
 #, python-format
 msgid "Action %s not supported"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:935
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:938
 #, python-format
 msgid ""
 "Creating an interface named %(name)s exceeds the %(limit)d character "
 "limitation. It was shortened to %(new_name)s to fit."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1130
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1133
 #, python-format
 msgid "VIF port: %s has no ofport configured, and might not be able to transmit"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1241
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1244
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1401
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1404
 #, python-format
 msgid "Invalid remote IP: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1444
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1447
 msgid "OVS is restarted. OVSNeutronAgent will reset bridges and recover ports."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1447
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1450
 msgid ""
 "OVS is dead. OVSNeutronAgent will keep running and checking OVS status "
 "periodically."
diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index 9112871d6d3..cb540740e57 100644
--- a/neutron/locale/neutron.pot
+++ b/neutron/locale/neutron.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 7.0.0.0b2.dev192\n"
+"Project-Id-Version: neutron 7.0.0.0b2.dev267\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-07-11 06:09+0000\n"
+"POT-Creation-Date: 2015-07-16 06:09+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"
@@ -277,16 +277,16 @@ msgstr ""
 msgid "Timeout in seconds for ovs-vsctl commands"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:474
+#: neutron/agent/common/ovs_lib.py:478
 #, python-format
 msgid "Unable to determine mac address for %s"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:582
+#: neutron/agent/common/ovs_lib.py:586
 msgid "Cannot match priority on flow deletion or modification"
 msgstr ""
 
-#: neutron/agent/common/ovs_lib.py:587
+#: neutron/agent/common/ovs_lib.py:591
 msgid "Must specify one or more actions on flow addition or modification"
 msgstr ""
 
@@ -347,7 +347,7 @@ msgstr ""
 msgid "Use broadcast in DHCP replies"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:280
+#: neutron/agent/l3/agent.py:272
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
 "agent as Neutron has more than one external network."
@@ -1228,7 +1228,7 @@ msgstr ""
 msgid "The core plugin Neutron will use"
 msgstr ""
 
-#: neutron/common/config.py:54 neutron/db/migration/cli.py:40
+#: neutron/common/config.py:54 neutron/db/migration/cli.py:45
 msgid "The service plugins Neutron will use"
 msgstr ""
 
@@ -2140,7 +2140,7 @@ msgstr ""
 msgid "Cannot specify both subnet-id and port-id"
 msgstr ""
 
-#: neutron/db/l3_db.py:521
+#: neutron/db/l3_db.py:525
 #, python-format
 msgid ""
 "Cannot have multiple router ports with the same network id if both "
@@ -2148,63 +2148,82 @@ msgid ""
 "id %(nid)s"
 msgstr ""
 
-#: neutron/db/l3_db.py:563
+#: neutron/db/l3_db.py:567
 msgid "Subnet for router interface must have a gateway IP"
 msgstr ""
 
-#: neutron/db/l3_db.py:567
+#: neutron/db/l3_db.py:571
 #, python-format
 msgid ""
 "IPv6 subnet %s configured to receive RAs from an external router cannot "
 "be added to Neutron Router."
 msgstr ""
 
-#: neutron/db/l3_db.py:779
+#: neutron/db/l3_db.py:783
 #, python-format
 msgid "Cannot add floating IP to port on subnet %s which has no gateway_ip"
 msgstr ""
 
-#: neutron/db/l3_db.py:820
+#: neutron/db/l3_db.py:828
 #, 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 ""
 
-#: neutron/db/l3_db.py:824
+#: neutron/db/l3_db.py:832
 #, python-format
 msgid ""
 "Cannot create floating IP and bind it to Port %s, since that port is "
 "owned by a different tenant."
 msgstr ""
 
-#: neutron/db/l3_db.py:836
+#: neutron/db/l3_db.py:844
+#, python-format
+msgid ""
+"Floating IP %(floatingip_id) is associated with non-IPv4 address "
+"%s(internal_ip)s and therefore cannot be bound."
+msgstr ""
+
+#: neutron/db/l3_db.py:848
+#, python-format
+msgid ""
+"Cannot create floating IP and bind it to %s, since that is not an IPv4 "
+"address."
+msgstr ""
+
+#: neutron/db/l3_db.py:856
 #, python-format
 msgid "Port %(id)s does not have fixed ip %(address)s"
 msgstr ""
 
-#: neutron/db/l3_db.py:843
+#: neutron/db/l3_db.py:863
 #, python-format
-msgid "Cannot add floating IP to port %s that has no fixed IP addresses"
+msgid "Cannot add floating IP to port %s that has no fixed IPv4 addresses"
 msgstr ""
 
-#: neutron/db/l3_db.py:847
+#: neutron/db/l3_db.py:867
 #, python-format
 msgid ""
-"Port %s has multiple fixed IPs.  Must provide a specific IP when "
-"assigning a floating IP"
+"Port %s has multiple fixed IPv4 addresses.  Must provide a specific IPv4 "
+"address when assigning a floating IP"
 msgstr ""
 
-#: neutron/db/l3_db.py:876
+#: neutron/db/l3_db.py:896
 msgid "fixed_ip_address cannot be specified without a port_id"
 msgstr ""
 
-#: neutron/db/l3_db.py:916
+#: neutron/db/l3_db.py:940
 #, python-format
 msgid "Network %s is not a valid external network"
 msgstr ""
 
-#: neutron/db/l3_db.py:1060
+#: neutron/db/l3_db.py:944
+#, python-format
+msgid "Network %s does not contain any IPv4 subnet"
+msgstr ""
+
+#: neutron/db/l3_db.py:1089
 #, python-format
 msgid "has device owner %s"
 msgstr ""
@@ -2215,11 +2234,11 @@ msgid ""
 " Only admin can override."
 msgstr ""
 
-#: neutron/db/l3_dvr_db.py:566
+#: neutron/db/l3_dvr_db.py:573
 msgid "Unable to create the Agent Gateway Port"
 msgstr ""
 
-#: neutron/db/l3_dvr_db.py:598
+#: neutron/db/l3_dvr_db.py:605
 msgid "Unable to create the SNAT Interface Port"
 msgstr ""
 
@@ -2276,60 +2295,62 @@ msgstr ""
 msgid "%s cannot be called while in offline mode"
 msgstr ""
 
-#: neutron/db/migration/cli.py:37
+#: neutron/db/migration/cli.py:42
 msgid "Neutron plugin provider module"
 msgstr ""
 
-#: neutron/db/migration/cli.py:43
+#: neutron/db/migration/cli.py:48
 #, python-format
 msgid "The advanced service to execute the command against. Can be one of '%s'."
 msgstr ""
 
-#: neutron/db/migration/cli.py:50
+#: neutron/db/migration/cli.py:55
 msgid "Neutron quota driver class"
 msgstr ""
 
-#: neutron/db/migration/cli.py:58
+#: neutron/db/migration/cli.py:63
 msgid "URL to database"
 msgstr ""
 
-#: neutron/db/migration/cli.py:61
+#: neutron/db/migration/cli.py:66
 msgid "Database engine"
 msgstr ""
 
-#: neutron/db/migration/cli.py:88
+#: neutron/db/migration/cli.py:93
 msgid "You must provide a revision or relative delta"
 msgstr ""
 
-#: neutron/db/migration/cli.py:92
+#: neutron/db/migration/cli.py:97
 msgid "Negative relative revision (downgrade) not supported"
 msgstr ""
 
-#: neutron/db/migration/cli.py:98
+#: neutron/db/migration/cli.py:103
 msgid "Use either --delta or relative revision, not both"
 msgstr ""
 
-#: neutron/db/migration/cli.py:101
+#: neutron/db/migration/cli.py:106
 msgid "Negative delta (downgrade) not supported"
 msgstr ""
 
-#: neutron/db/migration/cli.py:110
+#: neutron/db/migration/cli.py:119
 msgid "Downgrade no longer supported"
 msgstr ""
 
-#: neutron/db/migration/cli.py:130 neutron/db/migration/cli.py:143
-msgid "Timeline branches unable to generate timeline"
+#: neutron/db/migration/cli.py:158
+#, python-format
+msgid "No new branches are allowed except: %s"
 msgstr ""
 
-#: neutron/db/migration/cli.py:137
-msgid "HEAD file does not match migration timeline head"
+#: neutron/db/migration/cli.py:176
+#, python-format
+msgid "HEADS file does not match migration timeline heads, expected: %s"
 msgstr ""
 
-#: neutron/db/migration/cli.py:188
+#: neutron/db/migration/cli.py:227
 msgid "Available commands"
 msgstr ""
 
-#: neutron/db/migration/cli.py:196
+#: neutron/db/migration/cli.py:284
 #, python-format
 msgid "Package neutron-%s not installed"
 msgstr ""
@@ -2980,36 +3001,36 @@ msgstr ""
 msgid "Unsupported request type"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:62
+#: neutron/plugins/brocade/NeutronPlugin.py:61
 #: neutron/plugins/ml2/drivers/brocade/mechanism_brocade.py:22
 #: neutron/services/l3_router/brocade/l3_router_plugin.py:23
 msgid "The address of the host to SSH to"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:64
+#: neutron/plugins/brocade/NeutronPlugin.py:63
 #: neutron/plugins/ml2/drivers/brocade/mechanism_brocade.py:24
 #: neutron/services/l3_router/brocade/l3_router_plugin.py:25
 msgid "The SSH username to use"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:66
+#: neutron/plugins/brocade/NeutronPlugin.py:65
 #: neutron/plugins/ml2/drivers/brocade/mechanism_brocade.py:26
 #: neutron/services/l3_router/brocade/l3_router_plugin.py:27
 msgid "The SSH password to use"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:68
+#: neutron/plugins/brocade/NeutronPlugin.py:67
 msgid "Currently unused"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:72
+#: neutron/plugins/brocade/NeutronPlugin.py:71
 msgid "The network interface to use when creating a port"
 msgstr ""
 
-#: neutron/plugins/brocade/NeutronPlugin.py:300
-#: neutron/plugins/brocade/NeutronPlugin.py:341
-#: neutron/plugins/brocade/NeutronPlugin.py:394
-#: neutron/plugins/brocade/NeutronPlugin.py:425
+#: neutron/plugins/brocade/NeutronPlugin.py:299
+#: neutron/plugins/brocade/NeutronPlugin.py:340
+#: neutron/plugins/brocade/NeutronPlugin.py:393
+#: neutron/plugins/brocade/NeutronPlugin.py:424
 msgid "Brocade plugin raised exception, check logs"
 msgstr ""
 
@@ -4017,7 +4038,7 @@ msgstr ""
 msgid "network_type value '%s' not supported"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:231
+#: neutron/plugins/ml2/plugin.py:230
 msgid "binding:profile value too large"
 msgstr ""
 
@@ -4050,7 +4071,7 @@ msgstr ""
 msgid "%s prohibited for flat provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_gre.py:35
+#: neutron/plugins/ml2/drivers/type_gre.py:32
 msgid ""
 "Comma-separated list of <tun_min>:<tun_max> tuples enumerating ranges of "
 "GRE tunnel IDs that are available for tenant network allocation"
@@ -4061,30 +4082,30 @@ msgstr ""
 msgid "%s prohibited for local provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:122
+#: neutron/plugins/ml2/drivers/type_tunnel.py:168
 #, python-format
 msgid "provider:physical_network specified for %s network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:129
+#: neutron/plugins/ml2/drivers/type_tunnel.py:175
 #, python-format
 msgid "%(key)s prohibited for %(tunnel)s provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:254
+#: neutron/plugins/ml2/drivers/type_tunnel.py:300
 msgid "Tunnel IP value needed by the ML2 plugin"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:259
+#: neutron/plugins/ml2/drivers/type_tunnel.py:305
 msgid "Network type value needed by the ML2 plugin"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:286
+#: neutron/plugins/ml2/drivers/type_tunnel.py:332
 #, python-format
 msgid "Tunnel IP %(ip)s in use with host %(host)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_tunnel.py:305
+#: neutron/plugins/ml2/drivers/type_tunnel.py:351
 #, python-format
 msgid "Network type value '%s' not supported"
 msgstr ""
@@ -4116,13 +4137,13 @@ msgstr ""
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:34
+#: neutron/plugins/ml2/drivers/type_vxlan.py:32
 msgid ""
 "Comma-separated list of <vni_min>:<vni_max> tuples enumerating ranges of "
 "VXLAN VNI IDs that are available for tenant network allocation"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:38
+#: neutron/plugins/ml2/drivers/type_vxlan.py:36
 msgid "Multicast group for VXLAN. If unset, disables VXLAN multicast mode."
 msgstr ""
 
@@ -4544,23 +4565,23 @@ msgid ""
 "error: %(error)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1637
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1649
 msgid ""
 "DVR deployments for VXLAN/GRE underlays require L2-pop to be enabled, in "
 "both the Agent and Server side."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1651
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1663
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1673
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1685
 #, python-format
 msgid "Invalid tunnel type specified: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1676
+#: neutron/plugins/ml2/drivers/openvswitch/agent/ovs_neutron_agent.py:1688
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""