From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Fri, 12 Dec 2014 06:08:14 +0000 (+0000)
Subject: Imported Translations from Transifex
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=2770cd8a9b448ae894b13073cafea6e2ef923802;p=openstack-build%2Fneutron-build.git

Imported Translations from Transifex

For more information about this automatic import see:
https://wiki.openstack.org/wiki/Translations/Infrastructure

Change-Id: I18f00383ecae68436a9208f094a898849bfed8a2
---

diff --git a/neutron/locale/de/LC_MESSAGES/neutron-log-info.po b/neutron/locale/de/LC_MESSAGES/neutron-log-info.po
index b5af51d7d..0d7510b89 100644
--- a/neutron/locale/de/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/de/LC_MESSAGES/neutron-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
-"PO-Revision-Date: 2014-12-10 00:24+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+0000\n"
+"PO-Revision-Date: 2014-12-10 22:16+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/neutron/language/"
 "de/)\n"
@@ -38,16 +38,12 @@ msgstr "Synchronisation von Status"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "'agent_updated' (Agent aktualisiert) durch Serverseite %s!"
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr "Agent der Ebene 3 gestartet"
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -109,6 +105,10 @@ msgstr "Firewallregeln aktualisieren"
 msgid "No ports here to refresh firewall"
 msgstr ""
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr "Agent der Ebene 3 gestartet"
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1420,18 +1420,6 @@ msgstr ""
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr ""
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"
diff --git a/neutron/locale/es/LC_MESSAGES/neutron-log-info.po b/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
index 217539225..a22ed9e3c 100644
--- a/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
-"PO-Revision-Date: 2014-12-10 00:24+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+0000\n"
+"PO-Revision-Date: 2014-12-10 22:16+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/neutron/language/"
 "es/)\n"
@@ -37,16 +37,12 @@ msgstr "Sincronizando estado"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "agent_updated por el lado del servidor %s!"
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr "Se ha iniciado al agente L3"
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -108,6 +104,10 @@ msgstr "Renovar reglas de cortafuegos"
 msgid "No ports here to refresh firewall"
 msgstr ""
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr "Se ha iniciado al agente L3"
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1421,18 +1421,6 @@ msgstr ""
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr ""
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"
diff --git a/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po b/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po
index e96c9809d..f8a2ea3fb 100644
--- a/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
-"PO-Revision-Date: 2014-12-10 00:24+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+0000\n"
+"PO-Revision-Date: 2014-12-10 22:16+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/neutron/language/"
 "fr/)\n"
@@ -38,16 +38,12 @@ msgstr "Etat de synchronisation"
 msgid "Synchronizing state complete"
 msgstr "Etat de synchronisation complet"
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "agent_updated au niveau du serveur %s !"
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr "Agent de niveau 3 démarré"
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -109,6 +105,10 @@ msgstr "Régénération des règles de pare-feu"
 msgid "No ports here to refresh firewall"
 msgstr ""
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr "Agent de niveau 3 démarré"
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1423,18 +1423,6 @@ msgstr ""
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr "Suppression du mappage de connexion %s"
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"
diff --git a/neutron/locale/it/LC_MESSAGES/neutron-log-info.po b/neutron/locale/it/LC_MESSAGES/neutron-log-info.po
index 52ca9808b..0a47f1ba6 100644
--- a/neutron/locale/it/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/it/LC_MESSAGES/neutron-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
-"PO-Revision-Date: 2014-12-10 00:24+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+0000\n"
+"PO-Revision-Date: 2014-12-10 22:16+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/neutron/language/"
 "it/)\n"
@@ -38,16 +38,12 @@ msgstr "Stato sincronizzazione"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "agent_updated dal lato server %s!"
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr "Agent L3 avviato"
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -109,6 +105,10 @@ msgstr "Aggiorna regole firewall"
 msgid "No ports here to refresh firewall"
 msgstr ""
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr "Agent L3 avviato"
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1415,18 +1415,6 @@ msgstr ""
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr ""
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"
diff --git a/neutron/locale/ja/LC_MESSAGES/neutron-log-info.po b/neutron/locale/ja/LC_MESSAGES/neutron-log-info.po
index 56d271db5..c009b144a 100644
--- a/neutron/locale/ja/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/ja/LC_MESSAGES/neutron-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
-"PO-Revision-Date: 2014-12-10 00:24+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+0000\n"
+"PO-Revision-Date: 2014-12-10 22:16+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/neutron/"
 "language/ja/)\n"
@@ -38,16 +38,12 @@ msgstr "状態の同期中"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "サーバー・サイド %s による agent_updated!"
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr "L3 エージェントが始動しました"
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -109,6 +105,10 @@ msgstr "ファイアウォール・ルールの最新表示"
 msgid "No ports here to refresh firewall"
 msgstr ""
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr "L3 エージェントが始動しました"
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1417,18 +1417,6 @@ msgstr ""
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr ""
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"
diff --git a/neutron/locale/ko_KR/LC_MESSAGES/neutron-log-info.po b/neutron/locale/ko_KR/LC_MESSAGES/neutron-log-info.po
index 6cdb5be12..50948e2c9 100644
--- a/neutron/locale/ko_KR/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/ko_KR/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
-"PO-Revision-Date: 2014-12-10 00:24+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+0000\n"
+"PO-Revision-Date: 2014-12-10 22:16+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/neutron/"
 "language/ko_KR/)\n"
@@ -37,16 +37,12 @@ msgstr "상태 동기화 중"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "서버측 %s!에 의한 agent_updated"
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr "L3 에이전트가 시작됨"
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -108,6 +104,10 @@ msgstr "방화벽 규칙 새로 고치기"
 msgid "No ports here to refresh firewall"
 msgstr ""
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr "L3 에이전트가 시작됨"
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1410,18 +1410,6 @@ msgstr ""
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr ""
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"
diff --git a/neutron/locale/neutron-log-error.pot b/neutron/locale/neutron-log-error.pot
index 356a95c44..bf4387e8d 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 2015.1.dev657.ge55e715\n"
+"Project-Id-Version: neutron 2015.1.dev675.g21da71f\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
+"POT-Creation-Date: 2014-12-12 06:08+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"
@@ -48,7 +48,7 @@ msgstr ""
 msgid "Network %s info call failed."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3_agent.py:1994
+#: neutron/agent/dhcp_agent.py:593 neutron/agent/l3/agent.py:1715
 #: neutron/agent/metadata/agent.py:416
 #: neutron/plugins/hyperv/agent/hyperv_neutron_agent.py:148
 #: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:110
@@ -62,98 +62,98 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:512 neutron/tests/unit/test_l3_agent.py:1939
+#: neutron/agent/netns_cleanup_util.py:141
+#, python-format
+msgid "Error unable to destroy namespace: %s"
+msgstr ""
+
+#: neutron/agent/l3/agent.py:222 neutron/tests/unit/test_l3_agent.py:1785
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:584 neutron/agent/linux/dhcp.py:809
+#: neutron/agent/l3/agent.py:294 neutron/agent/linux/dhcp.py:809
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:589
+#: neutron/agent/l3/agent.py:299
 msgid "Router id is required if not using namespaces."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:607
+#: neutron/agent/l3/agent.py:317
 msgid "RuntimeError in obtaining router list for namespace cleanup."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:632
+#: neutron/agent/l3/agent.py:342
 #, python-format
 msgid "Failed to destroy stale router namespace %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:648 neutron/agent/linux/dhcp.py:238
+#: neutron/agent/l3/agent.py:358 neutron/agent/linux/dhcp.py:238
 #, python-format
 msgid "Failed trying to delete namespace: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:850
+#: neutron/agent/l3/agent.py:560
 #: neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py:632
 #, python-format
 msgid "Ignoring multiple IPs on router port %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1197
+#: neutron/agent/l3/agent.py:907
 #, python-format
 msgid "Failed sending gratuitous ARP: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1265
+#: neutron/agent/l3/agent.py:982
 msgid "DVR: no map match_port found!"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1470
+#: neutron/agent/l3/agent.py:1187
 msgid "DVR: error adding redirection logic"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1482
+#: neutron/agent/l3/agent.py:1199
 msgid "DVR: removed snat failed"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1578
+#: neutron/agent/l3/agent.py:1295
 msgid "Missing subnet/agent_gateway_port"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1721
+#: neutron/agent/l3/agent.py:1440
 msgid "DVR: Failed updating arp entry"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1770
+#: neutron/agent/l3/agent.py:1491
 #, python-format
 msgid "The external network bridge '%s' does not exist"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1810
+#: neutron/agent/l3/agent.py:1531
 #, python-format
 msgid "Failed to fetch router information for '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1828
+#: neutron/agent/l3/agent.py:1549
 #, python-format
 msgid "Removing incompatible router '%s'"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1865
+#: neutron/agent/l3/agent.py:1586
 msgid "Failed synchronizing routers due to RPC error"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1868
+#: neutron/agent/l3/agent.py:1589
 #: neutron/services/metering/agents/metering_agent.py:62
 msgid "Failed synchronizing routers"
 msgstr ""
 
-#: neutron/agent/l3_ha_agent.py:136
+#: neutron/agent/l3/ha.py:136
 #, python-format
 msgid "Unable to process HA router %s without ha port"
 msgstr ""
 
-#: neutron/agent/netns_cleanup_util.py:141
-#, python-format
-msgid "Error unable to destroy namespace: %s"
-msgstr ""
-
 #: neutron/agent/linux/async_process.py:164
 #, python-format
 msgid "An error occurred while killing [%s]."
@@ -770,8 +770,6 @@ msgstr ""
 
 #: neutron/plugins/embrane/base_plugin.py:106
 #: neutron/plugins/embrane/agent/dispatcher.py:131
-#: neutron/services/loadbalancer/drivers/embrane/poller.py:55
-#: neutron/services/loadbalancer/drivers/embrane/agent/dispatcher.py:107
 msgid "Unhandled exception occurred"
 msgstr ""
 
@@ -1832,83 +1830,83 @@ msgid ""
 "%(sec_group_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:903
+#: neutron/plugins/vmware/plugins/service.py:897
 #, python-format
 msgid "Failed to create firewall on vShield Edge bound on router %s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:910
+#: neutron/plugins/vmware/plugins/service.py:904
 msgid "Bad Firewall request Input"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1131
+#: neutron/plugins/vmware/plugins/service.py:1125
 #, python-format
 msgid "Failed to find the edge with vip_id: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1202
+#: neutron/plugins/vmware/plugins/service.py:1196
 #, python-format
 msgid "Failed to create healthmonitor associated with pool id: %s!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1219
+#: neutron/plugins/vmware/plugins/service.py:1213
 msgid "Failed to create pool on vshield edge"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1279
+#: neutron/plugins/vmware/plugins/service.py:1273
 msgid "Failed to create vip!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1319
+#: neutron/plugins/vmware/plugins/service.py:1313
 #, python-format
 msgid "Failed to update vip with id: %s!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1336
+#: neutron/plugins/vmware/plugins/service.py:1330
 #, python-format
 msgid "Failed to delete vip with id: %s!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1392
+#: neutron/plugins/vmware/plugins/service.py:1386
 #, python-format
 msgid "Failed to update pool with id: %s!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1414
-#: neutron/plugins/vmware/plugins/service.py:1461
-#: neutron/plugins/vmware/plugins/service.py:1484
+#: neutron/plugins/vmware/plugins/service.py:1408
+#: neutron/plugins/vmware/plugins/service.py:1455
+#: neutron/plugins/vmware/plugins/service.py:1478
 msgid "Failed to update pool with the member"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1440
+#: neutron/plugins/vmware/plugins/service.py:1434
 msgid "Failed to update old pool with the member"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1504
+#: neutron/plugins/vmware/plugins/service.py:1498
 #, python-format
 msgid "Failed to update monitor with id: %s!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1543
+#: neutron/plugins/vmware/plugins/service.py:1537
 msgid "Failed to associate monitor with pool!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1574
+#: neutron/plugins/vmware/plugins/service.py:1568
 msgid "Failed to update pool with pool_monitor!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1616
+#: neutron/plugins/vmware/plugins/service.py:1610
 msgid "Bad or unsupported Input request!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1619
+#: neutron/plugins/vmware/plugins/service.py:1613
 #, python-format
 msgid ""
 "Failed to update ipsec VPN configuration with vpnservice: "
 "%(vpnservice_id)s on vShield Edge: %(edge_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1771
+#: neutron/plugins/vmware/plugins/service.py:1765
 #, python-format
 msgid "Router %s not found"
 msgstr ""
@@ -2064,82 +2062,82 @@ msgstr ""
 msgid "Failed to delete ipsec vpn configuration with edge_id: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:185
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:183
 #, python-format
 msgid "Failed to create app profile on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:196
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:194
 #, python-format
 msgid "Failed to create vip on vshield edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:231
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:229
 msgid "Failed to get vip on edge"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:248
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:246
 #, python-format
 msgid "Failed to update app profile on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:256
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:254
 #, python-format
 msgid "Failed to update vip on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:267
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:265
 #, python-format
 msgid "vip not found on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:270
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:268
 #, python-format
 msgid "Failed to delete vip on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:275
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:273
 #, python-format
 msgid "app profile not found on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:278
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:276
 #, python-format
 msgid "Failed to delete app profile on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:289
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:287
 msgid "Failed to create pool"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:316
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:314
 msgid "Failed to get pool on edge"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:328
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:326
 msgid "Failed to update pool"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:338
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:336
 msgid "Failed to delete pool"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:348
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:346
 #, python-format
 msgid "Failed to create monitor on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:376
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:374
 #, python-format
 msgid "Failed to get monitor on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:393
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:391
 #, python-format
 msgid "Failed to update monitor on edge: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:404
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:402
 msgid "Failed to delete monitor"
 msgstr ""
 
@@ -2173,6 +2171,10 @@ msgstr ""
 msgid "Error loading provider '%(provider)s' for service %(service_type)s"
 msgstr ""
 
+#: neutron/services/firewall/fwaas_plugin.py:24
+msgid "Firewall service plugin requires neutron-fwaas module"
+msgstr ""
+
 #: neutron/services/firewall/agents/l3reference/firewall_l3_agent.py:144
 #, python-format
 msgid "Firewall Driver Error for %(func_name)s for fw: %(fwid)s"
@@ -2244,6 +2246,10 @@ msgid ""
 "router_id=%(router_id)s"
 msgstr ""
 
+#: neutron/services/loadbalancer/plugin.py:24
+msgid "Loadbalancer service plugin requires neutron-lbaas module"
+msgstr ""
+
 #: neutron/services/metering/agents/metering_agent.py:180
 #, python-format
 msgid "Driver %(driver)s does not implement %(func)s"
@@ -2254,6 +2260,10 @@ msgstr ""
 msgid "Driver %(driver)s:%(func)s runtime error"
 msgstr ""
 
+#: neutron/services/vpn/plugin.py:24
+msgid "VPN service plugin requires neutron-vpnaas module"
+msgstr ""
+
 #: neutron/tests/unit/cisco/l3/device_handling_test_support.py:99
 #, python-format
 msgid "Failed to delete port %(p_id)s for vm instance %(v_id)s due to %(err)s"
diff --git a/neutron/locale/neutron-log-info.pot b/neutron/locale/neutron-log-info.pot
index 81ee733ef..ebe1cb0b0 100644
--- a/neutron/locale/neutron-log-info.pot
+++ b/neutron/locale/neutron-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.1.dev657.ge55e715\n"
+"Project-Id-Version: neutron 2015.1.dev675.g21da71f\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+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"
@@ -36,16 +36,12 @@ msgstr ""
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr ""
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -107,6 +103,10 @@ msgstr ""
 msgid "No ports here to refresh firewall"
 msgstr ""
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr ""
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1397,18 +1397,6 @@ msgstr ""
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr ""
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"
diff --git a/neutron/locale/neutron-log-warning.pot b/neutron/locale/neutron-log-warning.pot
index c8c20c308..1b9d1fdba 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 2015.1.dev657.ge55e715\n"
+"Project-Id-Version: neutron 2015.1.dev675.g21da71f\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+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"
@@ -56,7 +56,7 @@ msgid ""
 "port %(port_id)s, for router %(router_id)s will be considered"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:587 neutron/agent/l3_agent.py:1989
+#: neutron/agent/dhcp_agent.py:587 neutron/agent/l3/agent.py:1710
 #: neutron/agent/metadata/agent.py:411
 #: neutron/plugins/cisco/cfg_agent/cfg_agent.py:321
 #: neutron/services/metering/agents/metering_agent.py:273
@@ -65,7 +65,28 @@ msgid ""
 " will be disabled."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:533
+#: neutron/agent/rpc.py:101
+msgid "DVR functionality requires a server upgrade."
+msgstr ""
+
+#: neutron/agent/securitygroups_rpc.py:67
+#: neutron/agent/securitygroups_rpc.py:157
+msgid "Driver configuration doesn't match with enable_security_group"
+msgstr ""
+
+#: neutron/agent/securitygroups_rpc.py:112
+msgid ""
+"Security group agent binding currently not set. This should be set by the"
+" end of the init process."
+msgstr ""
+
+#: neutron/agent/securitygroups_rpc.py:184
+msgid ""
+"security_group_info_for_devices rpc call not supported by the server, "
+"falling back to old security_group_rules_for_devices which scales worse."
+msgstr ""
+
+#: neutron/agent/l3/agent.py:243
 #, python-format
 msgid ""
 "l3-agent cannot check service plugins enabled at the neutron server when "
@@ -74,44 +95,23 @@ msgid ""
 "warning. Detail message: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:545
+#: neutron/agent/l3/agent.py:255
 #, python-format
 msgid ""
 "l3-agent cannot check service plugins enabled on the neutron server. "
 "Retrying. Detail message: %s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:775
+#: neutron/agent/l3/agent.py:485
 #, python-format
 msgid "Info for router %s were not found. Skipping router removal"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:1114
+#: neutron/agent/l3/agent.py:824
 #, python-format
 msgid "Unable to configure IP address for floating IP: %s"
 msgstr ""
 
-#: neutron/agent/rpc.py:101
-msgid "DVR functionality requires a server upgrade."
-msgstr ""
-
-#: neutron/agent/securitygroups_rpc.py:67
-#: neutron/agent/securitygroups_rpc.py:157
-msgid "Driver configuration doesn't match with enable_security_group"
-msgstr ""
-
-#: neutron/agent/securitygroups_rpc.py:112
-msgid ""
-"Security group agent binding currently not set. This should be set by the"
-" end of the init process."
-msgstr ""
-
-#: neutron/agent/securitygroups_rpc.py:184
-msgid ""
-"security_group_info_for_devices rpc call not supported by the server, "
-"falling back to old security_group_rules_for_devices which scales worse."
-msgstr ""
-
 #: neutron/agent/linux/iptables_manager.py:155
 #, python-format
 msgid "Attempted to remove chain %s which does not exist"
@@ -263,11 +263,6 @@ msgstr ""
 msgid "No valid gateway port on subnet %s is found for IPv6 RA"
 msgstr ""
 
-#: neutron/db/vpn/vpn_db.py:660
-#, python-format
-msgid "vpnservice %s in db is already deleted"
-msgstr ""
-
 #: neutron/debug/debug_agent.py:123
 #, python-format
 msgid "Failed to delete namespace %s"
@@ -1113,7 +1108,7 @@ msgid ""
 "security group %(sec_group_id)s was not found on the backend"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:557
+#: neutron/plugins/vmware/plugins/service.py:551
 #, python-format
 msgid "Did not found lswitch %s in NSX"
 msgstr ""
@@ -1153,25 +1148,3 @@ msgstr ""
 msgid "No L3 agents can host the router %s"
 msgstr ""
 
-#: neutron/services/loadbalancer/agent_scheduler.py:110
-#, python-format
-msgid "No active lbaas agents for pool %s"
-msgstr ""
-
-#: neutron/services/loadbalancer/agent_scheduler.py:116
-#, python-format
-msgid "No lbaas agent supporting device driver %s"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/driver.py:130
-#, python-format
-msgid "Subnet assigned to pool %s doesn't exist, backend port can't be created"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/agent/lb_operations.py:110
-#, python-format
-msgid ""
-"The load balancer %s had no physical representation, likely already "
-"deleted"
-msgstr ""
-
diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index 8d4c33097..1991779a6 100644
--- a/neutron/locale/neutron.pot
+++ b/neutron/locale/neutron.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.1.dev657.ge55e715\n"
+"Project-Id-Version: neutron 2015.1.dev675.g21da71f\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+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"
@@ -385,7 +385,7 @@ msgstr ""
 msgid "Number of threads to use during sync process."
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:67 neutron/agent/l3_agent.py:492
+#: neutron/agent/dhcp_agent.py:67 neutron/agent/l3/agent.py:202
 #: neutron/agent/metadata/namespace_proxy.py:166
 msgid "Location of Metadata Proxy UNIX domain socket"
 msgstr ""
@@ -395,11 +395,64 @@ msgstr ""
 msgid "Agent updated: %(payload)s"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:211
-msgid "Cannot allocate link local address"
+#: neutron/agent/netns_cleanup_util.py:60
+msgid "Delete the namespace by removing all devices."
+msgstr ""
+
+#: neutron/agent/ovs_cleanup_util.py:40
+msgid ""
+"True to delete all ports on all the OpenvSwitch bridges. False to delete "
+"ports created by Neutron on integration and external network bridges."
+msgstr ""
+
+#: neutron/agent/securitygroups_rpc.py:36
+msgid "Driver for security groups firewall in the L2 agent"
+msgstr ""
+
+#: neutron/agent/securitygroups_rpc.py:40
+msgid ""
+"Controls whether the neutron security group API is enabled in the server."
+" It should be false when using no security groups or using the nova "
+"security group API."
+msgstr ""
+
+#: neutron/agent/securitygroups_rpc.py:47
+msgid "Use ipset to speed-up the iptables based security groups."
+msgstr ""
+
+#: neutron/agent/common/config.py:29
+msgid "Root helper application."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:453
+#: neutron/agent/common/config.py:34
+msgid ""
+"Seconds between nodes reporting state to server; should be less than "
+"agent_down_time, best if it is half or less than agent_down_time."
+msgstr ""
+
+#: neutron/agent/common/config.py:41
+msgid "The driver used to manage the virtual interface."
+msgstr ""
+
+#: neutron/agent/common/config.py:46
+msgid "Allow overlapping IP."
+msgstr ""
+
+#: neutron/agent/common/config.py:51
+msgid "Add comments to iptables rules."
+msgstr ""
+
+#: neutron/agent/common/config.py:111
+msgid ""
+"DEFAULT.root_helper is deprecated! Please move root_helper configuration "
+"to [AGENT] section."
+msgstr ""
+
+#: neutron/agent/common/config.py:122
+msgid "Top-level directory for maintaining dhcp state"
+msgstr ""
+
+#: neutron/agent/l3/agent.py:163
 msgid ""
 "The working mode for the agent. Allowed modes are: 'legacy' - this "
 "preserves the existing behavior where the L3 agent is deployed on a "
@@ -411,130 +464,77 @@ msgid ""
 "centralized node (or in single-host deployments, e.g. devstack)"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:466 neutron/debug/debug_agent.py:42
+#: neutron/agent/l3/agent.py:176 neutron/debug/debug_agent.py:42
 msgid "Name of bridge used for external network traffic."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:470
+#: neutron/agent/l3/agent.py:180
 msgid "TCP Port used by Neutron metadata namespace proxy."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:474
+#: neutron/agent/l3/agent.py:184
 msgid ""
 "Send this many gratuitous ARPs for HA setup, if less than or equal to 0, "
 "the feature is disabled"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:477
+#: neutron/agent/l3/agent.py:187
 msgid ""
 "If namespaces is disabled, the l3 agent can only configure a router that "
 "has the matching router ID."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:482
+#: neutron/agent/l3/agent.py:192
 msgid "Agent should implement routers with no gateway"
 msgstr ""
 
-#: neutron/agent/l3_agent.py:484
+#: neutron/agent/l3/agent.py:194
 msgid "UUID of external network for routers implemented by the agents."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:487
+#: neutron/agent/l3/agent.py:197
 msgid "Allow running metadata proxy."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:489
+#: neutron/agent/l3/agent.py:199
 msgid "Delete namespace after removing a router."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:739
+#: neutron/agent/l3/agent.py:449
 msgid ""
 "The 'gateway_external_network_id' option must be configured for this "
 "agent as Neutron has more than one external network."
 msgstr ""
 
-#: neutron/agent/l3_agent.py:848
+#: neutron/agent/l3/agent.py:558
 #: neutron/plugins/cisco/cfg_agent/service_helpers/routing_svc_helper.py:630
 #, python-format
 msgid "Router port %s has no IP address"
 msgstr ""
 
-#: neutron/agent/l3_ha_agent.py:35
+#: neutron/agent/l3/ha.py:35
 msgid "Location to store keepalived/conntrackd config files"
 msgstr ""
 
-#: neutron/agent/l3_ha_agent.py:39
+#: neutron/agent/l3/ha.py:39
 msgid "VRRP authentication type AH/PASS"
 msgstr ""
 
-#: neutron/agent/l3_ha_agent.py:41
+#: neutron/agent/l3/ha.py:41
 msgid "VRRP authentication password"
 msgstr ""
 
-#: neutron/agent/l3_ha_agent.py:45
+#: neutron/agent/l3/ha.py:45
 msgid "The advertisement interval in seconds"
 msgstr ""
 
-#: neutron/agent/l3_ha_agent.py:56
+#: neutron/agent/l3/ha.py:56
 #, python-format
 msgid "Router %s is not a HA router"
 msgstr ""
 
-#: neutron/agent/netns_cleanup_util.py:60
-msgid "Delete the namespace by removing all devices."
-msgstr ""
-
-#: neutron/agent/ovs_cleanup_util.py:40
-msgid ""
-"True to delete all ports on all the OpenvSwitch bridges. False to delete "
-"ports created by Neutron on integration and external network bridges."
-msgstr ""
-
-#: neutron/agent/securitygroups_rpc.py:36
-msgid "Driver for security groups firewall in the L2 agent"
-msgstr ""
-
-#: neutron/agent/securitygroups_rpc.py:40
-msgid ""
-"Controls whether the neutron security group API is enabled in the server."
-" It should be false when using no security groups or using the nova "
-"security group API."
-msgstr ""
-
-#: neutron/agent/securitygroups_rpc.py:47
-msgid "Use ipset to speed-up the iptables based security groups."
-msgstr ""
-
-#: neutron/agent/common/config.py:29
-msgid "Root helper application."
-msgstr ""
-
-#: neutron/agent/common/config.py:34
-msgid ""
-"Seconds between nodes reporting state to server; should be less than "
-"agent_down_time, best if it is half or less than agent_down_time."
-msgstr ""
-
-#: neutron/agent/common/config.py:41
-msgid "The driver used to manage the virtual interface."
-msgstr ""
-
-#: neutron/agent/common/config.py:46
-msgid "Allow overlapping IP."
-msgstr ""
-
-#: neutron/agent/common/config.py:51
-msgid "Add comments to iptables rules."
-msgstr ""
-
-#: neutron/agent/common/config.py:111
-msgid ""
-"DEFAULT.root_helper is deprecated! Please move root_helper configuration "
-"to [AGENT] section."
-msgstr ""
-
-#: neutron/agent/common/config.py:122
-msgid "Top-level directory for maintaining dhcp state"
+#: neutron/agent/l3/link_local_allocator.py:85
+msgid "Cannot allocate link local address"
 msgstr ""
 
 #: neutron/agent/linux/async_process.py:67
@@ -2000,19 +2000,6 @@ msgid ""
 "sort '%(resource)s'"
 msgstr ""
 
-#: 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 ""
-
-#: neutron/db/loadbalancer/loadbalancer_db.py:275
-msgid "'cookie_name' should be specified for this type of session persistence."
-msgstr ""
-
-#: neutron/db/loadbalancer/loadbalancer_db.py:279
-msgid "'cookie_name' is not allowed for this type of session persistence"
-msgstr ""
-
 #: neutron/db/migration/__init__.py:40
 #, python-format
 msgid "%s cannot be called while in offline mode"
@@ -2559,6 +2546,7 @@ msgid "No active loadbalancer agent found for pool %(pool_id)s."
 msgstr ""
 
 #: neutron/extensions/loadbalancer.py:33
+#: neutron/extensions/loadbalancerv2.py:75
 msgid "Delay must be greater than or equal to timeout"
 msgstr ""
 
@@ -2639,21 +2627,105 @@ msgid "Number of vips allowed per tenant. A negative value means unlimited."
 msgstr ""
 
 #: neutron/extensions/loadbalancer.py:315
+#: neutron/extensions/loadbalancerv2.py:348
 msgid "Number of pools allowed per tenant. A negative value means unlimited."
 msgstr ""
 
 #: neutron/extensions/loadbalancer.py:319
+#: neutron/extensions/loadbalancerv2.py:352
 msgid ""
 "Number of pool members allowed per tenant. A negative value means "
 "unlimited."
 msgstr ""
 
 #: neutron/extensions/loadbalancer.py:323
+#: neutron/extensions/loadbalancerv2.py:356
 msgid ""
 "Number of health monitors allowed per tenant. A negative value means "
 "unlimited."
 msgstr ""
 
+#: neutron/extensions/loadbalancerv2.py:67
+#, python-format
+msgid "Required attribute %(attr_name)s not specified"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:71
+#, python-format
+msgid "%(name)s %(id)s could not be found"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:79
+#, python-format
+msgid "%(entity_using)s %(id)s is using this %(entity_in_use)s"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:83
+#, python-format
+msgid ""
+"Load Balancer %(lb_id)s already has a listener with protocol_port of "
+"%(protocol_port)s"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:88
+#, python-format
+msgid ""
+"Listener protocol %(listener_proto)s and pool protocol %(pool_proto)s are"
+" not compatible."
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:93
+#, python-format
+msgid "Cannot change %(attribute)s if one already exists"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:97
+#, python-format
+msgid "Invalid state %(state)s of loadbalancer resource %(id)s"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:101
+#, python-format
+msgid "Member %(member_id)s could not be found in pool %(pool_id)s"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:105
+#, python-format
+msgid ""
+"Member with address %(address)s and protocol_port %(port)s already "
+"present in pool %(pool)s"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:110
+#, python-format
+msgid ""
+"Member with address %(address)s and subnet %(subnet_id)  have mismatched "
+"IP versions"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:115
+msgid "An error happened in the driver"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:119
+#, python-format
+msgid ""
+"Load balancer %(load_balancer_id)s configuration is notsupported by "
+"driver %(driver_name)s"
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:340
+msgid ""
+"Number of LoadBalancers allowed per tenant. A negative value means "
+"unlimited."
+msgstr ""
+
+#: neutron/extensions/loadbalancerv2.py:344
+msgid ""
+"Number of Loadbalancer Listeners allowed per tenant. A negative value "
+"means unlimited."
+msgstr ""
+
 #: neutron/extensions/metering.py:31
 #, python-format
 msgid "Metering label %(label_id)s does not exist"
@@ -4075,17 +4147,14 @@ msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
 #: neutron/plugins/embrane/common/config.py:21
-#: neutron/services/loadbalancer/drivers/embrane/config.py:23
 msgid "ESM management root address"
 msgstr ""
 
 #: neutron/plugins/embrane/common/config.py:23
-#: neutron/services/loadbalancer/drivers/embrane/config.py:25
 msgid "ESM admin username."
 msgstr ""
 
 #: neutron/plugins/embrane/common/config.py:26
-#: neutron/services/loadbalancer/drivers/embrane/config.py:28
 msgid "ESM admin password."
 msgstr ""
 
@@ -4110,17 +4179,14 @@ msgid "Dummy user traffic Security Zone id"
 msgstr ""
 
 #: neutron/plugins/embrane/common/config.py:38
-#: neutron/services/loadbalancer/drivers/embrane/config.py:40
 msgid "Shared resource pool id"
 msgstr ""
 
 #: neutron/plugins/embrane/common/config.py:40
-#: neutron/services/loadbalancer/drivers/embrane/config.py:47
 msgid "Define if the requests have run asynchronously or not"
 msgstr ""
 
 #: neutron/plugins/embrane/common/constants.py:47
-#: neutron/services/loadbalancer/drivers/embrane/constants.py:48
 #, python-format
 msgid "Dva is pending for the following reason: %s"
 msgstr ""
@@ -4132,7 +4198,6 @@ msgid ""
 msgstr ""
 
 #: neutron/plugins/embrane/common/constants.py:50
-#: neutron/services/loadbalancer/drivers/embrane/constants.py:51
 #, python-format
 msgid "Dva seems to be broken for reason %s"
 msgstr ""
@@ -4143,19 +4208,16 @@ msgid "Dva interface seems to be broken for reason %s"
 msgstr ""
 
 #: neutron/plugins/embrane/common/constants.py:53
-#: neutron/services/loadbalancer/drivers/embrane/constants.py:52
 #, python-format
 msgid "Dva creation failed reason %s"
 msgstr ""
 
 #: neutron/plugins/embrane/common/constants.py:54
-#: neutron/services/loadbalancer/drivers/embrane/constants.py:53
 #, python-format
 msgid "Dva creation is in pending state for reason %s"
 msgstr ""
 
 #: neutron/plugins/embrane/common/constants.py:56
-#: neutron/services/loadbalancer/drivers/embrane/constants.py:55
 #, python-format
 msgid "Dva configuration failed for reason %s"
 msgstr ""
@@ -5165,43 +5227,43 @@ msgstr ""
 msgid "Missing required field(s) to configure nexus switch: %(fields)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:29
+#: neutron/plugins/ml2/drivers/freescale/config.py:28
 msgid "CRD service Username."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:32
+#: neutron/plugins/ml2/drivers/freescale/config.py:31
 msgid "CRD Service Password."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:34
+#: neutron/plugins/ml2/drivers/freescale/config.py:33
 msgid "CRD Tenant Name."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:37
+#: neutron/plugins/ml2/drivers/freescale/config.py:36
 msgid "CRD Auth URL."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:40
+#: neutron/plugins/ml2/drivers/freescale/config.py:39
 msgid "URL for connecting to CRD service."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:43
+#: neutron/plugins/ml2/drivers/freescale/config.py:42
 msgid "Timeout value for connecting to CRD service in seconds."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:47
+#: neutron/plugins/ml2/drivers/freescale/config.py:46
 msgid "Region name for connecting to CRD Service in admin context."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:51
+#: neutron/plugins/ml2/drivers/freescale/config.py:50
 msgid "If set, ignore any SSL validation issues."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:54
+#: neutron/plugins/ml2/drivers/freescale/config.py:53
 msgid "Auth strategy for connecting to neutron in admin context."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/freescale/config.py:57
+#: neutron/plugins/ml2/drivers/freescale/config.py:56
 msgid "Location of ca certificates file to use for CRD client requests."
 msgstr ""
 
@@ -6769,8 +6831,8 @@ msgstr ""
 
 #: neutron/plugins/vmware/plugins/base.py:1435
 #: neutron/plugins/vmware/plugins/base.py:1520
-#: neutron/plugins/vmware/plugins/service.py:217
-#: neutron/plugins/vmware/plugins/service.py:1255
+#: neutron/plugins/vmware/plugins/service.py:211
+#: neutron/plugins/vmware/plugins/service.py:1249
 #, python-format
 msgid "Network '%s' is not a valid external network"
 msgstr ""
@@ -6820,75 +6882,75 @@ msgstr ""
 msgid "Port values not valid for protocol: %s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:440
+#: neutron/plugins/vmware/plugins/service.py:434
 #, python-format
 msgid "An exception occurred while creating a port on lswitch %s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:455
+#: neutron/plugins/vmware/plugins/service.py:449
 #, python-format
 msgid "Unable to create port on NSX logical router %s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:488
+#: neutron/plugins/vmware/plugins/service.py:482
 #, python-format
 msgid "Unable to create integration logic switch for router %s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:498
+#: neutron/plugins/vmware/plugins/service.py:492
 #, python-format
 msgid "Unable to add router interface to integration lswitch for router %s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:508
+#: neutron/plugins/vmware/plugins/service.py:502
 #, python-format
 msgid "Unable to create advance service router for %s"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:925
-#: neutron/plugins/vmware/plugins/service.py:1241
+#: neutron/plugins/vmware/plugins/service.py:919
+#: neutron/plugins/vmware/plugins/service.py:1235
 msgid "router_id is not provided!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:929
-#: neutron/plugins/vmware/plugins/service.py:1629
+#: neutron/plugins/vmware/plugins/service.py:923
+#: neutron/plugins/vmware/plugins/service.py:1623
 #, python-format
 msgid "router_id:%s is not an advanced router!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:934
+#: neutron/plugins/vmware/plugins/service.py:928
 msgid "A firewall is already associated with the router"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1168
+#: neutron/plugins/vmware/plugins/service.py:1162
 #, python-format
 msgid ""
 "Operation can't be performed, Since resource %(model)s : %(id)s is in "
 "DELETEing status!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1177
+#: neutron/plugins/vmware/plugins/service.py:1171
 #, python-format
 msgid "Resource %(model)s : %(id)s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1246
+#: neutron/plugins/vmware/plugins/service.py:1240
 #, python-format
 msgid "router_id: %s is not an advanced router!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1514
+#: neutron/plugins/vmware/plugins/service.py:1508
 msgid "Vcns right now can only support one monitor per pool"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1591
+#: neutron/plugins/vmware/plugins/service.py:1585
 #, python-format
 msgid ""
 "Failed to update ipsec vpn configuration on edge, since the router: %s "
 "does not have a gateway yet!"
 msgstr ""
 
-#: neutron/plugins/vmware/plugins/service.py:1634
+#: neutron/plugins/vmware/plugins/service.py:1628
 #, python-format
 msgid "a vpnservice is already associated with the router: %s"
 msgstr ""
@@ -6985,22 +7047,22 @@ msgid ""
 "VSE right now."
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:159
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:157
 #, python-format
 msgid "Invalid %(protocol)s persistence method: %(type)s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:214
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:212
 #, python-format
 msgid "vip_binding not found with id: %(id)s edge_id: %(edge_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:306
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:304
 #, python-format
 msgid "pool_binding not found with id: %(id)s edge_id: %(edge_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:366
+#: neutron/plugins/vmware/vshield/edge_loadbalancer_driver.py:364
 #, python-format
 msgid "monitor_binding not found with id: %(id)s edge_id: %(edge_id)s"
 msgstr ""
@@ -7161,62 +7223,6 @@ msgstr ""
 msgid "BrocadeSVIPlugin: adding redundant router interface is not supported"
 msgstr ""
 
-#: neutron/services/loadbalancer/drivers/embrane/config.py:30
-msgid "Load Balancer image id (Embrane LB)"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/config.py:32
-msgid "In band Security Zone id for LBs"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/config.py:34
-msgid "Out of band Security Zone id for LBs"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/config.py:36
-msgid "Management Security Zone id for LBs"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/config.py:38
-msgid "Dummy user traffic Security Zone id for LBs"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/config.py:42
-msgid "choose LB image flavor to use, accepted values: small, medium"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/config.py:45
-msgid "resource synchronization interval in seconds"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/constants.py:49
-#, python-format
-msgid "%s, probably was cancelled through the heleos UI"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/constants.py:56
-#, python-format
-msgid ""
-"Failed to delete the backend load balancer for reason %s. Please remove "
-"it manually through the heleos UI"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/constants.py:59
-#, python-format
-msgid ""
-"No subnet is associated to member %s (required to identify the proper "
-"load balancer port)"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/driver.py:86
-msgid "Connection limit is not supported by Embrane LB"
-msgstr ""
-
-#: neutron/services/loadbalancer/drivers/embrane/driver.py:92
-#, python-format
-msgid "Session persistence %s not supported by Embrane LBaaS"
-msgstr ""
-
 #: neutron/services/metering/agents/metering_agent.py:71
 msgid "Metering driver"
 msgstr ""
@@ -7237,37 +7243,6 @@ msgstr ""
 msgid "An interface driver must be specified"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:45
-#, python-format
-msgid "Fatal - %(reason)s"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:79
-#, python-format
-msgid "No available Cisco CSR %(type)s IDs from %(min)d..%(max)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:134
-#, python-format
-msgid ""
-"Database inconsistency between IPSec connection and Cisco CSR mapping "
-"table (%s)"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:196
-#, python-format
-msgid ""
-"Existing entry for IPSec connection %s not found in Cisco CSR mapping "
-"table"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:223
-#, python-format
-msgid ""
-"Attempt to create duplicate entry in Cisco CSR mapping table for "
-"connection %s"
-msgstr ""
-
 #: neutron/tests/functional/agent/linux/simple_daemon.py:37
 msgid ""
 "uuid provided from the command line so external_process can track us via "
diff --git a/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po b/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po
index 3d1f8851a..c2430f29f 100644
--- a/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
-"PO-Revision-Date: 2014-12-10 00:24+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+0000\n"
+"PO-Revision-Date: 2014-12-10 22:16+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "neutron/language/pt_BR/)\n"
@@ -39,16 +39,12 @@ msgstr "Sincronizando estado"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "agent_updated por lado do servidor %s!"
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr "Agente L3 iniciado"
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -110,6 +106,10 @@ msgstr "Atualizar regras de firewall"
 msgid "No ports here to refresh firewall"
 msgstr "Nenhuma porta aqui para atualizar firewall"
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr "Agente L3 iniciado"
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1416,18 +1416,6 @@ msgstr "Carregando driver de medição %s"
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr ""
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"
diff --git a/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po b/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
index e5a9dd807..639085e98 100644
--- a/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
-"PO-Revision-Date: 2014-12-10 00:24+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+0000\n"
+"PO-Revision-Date: 2014-12-10 22:16+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/neutron/"
 "language/zh_CN/)\n"
@@ -37,16 +37,12 @@ msgstr "正在使状态同步"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "服务器端 %s 已更新代理！"
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr "已启动 L3 代理"
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -108,6 +104,10 @@ msgstr "请刷新防火墙规则"
 msgid "No ports here to refresh firewall"
 msgstr ""
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr "已启动 L3 代理"
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1408,18 +1408,6 @@ msgstr ""
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr ""
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"
diff --git a/neutron/locale/zh_TW/LC_MESSAGES/neutron-log-info.po b/neutron/locale/zh_TW/LC_MESSAGES/neutron-log-info.po
index 434a0ccb3..58a314e29 100644
--- a/neutron/locale/zh_TW/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/zh_TW/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-12-10 06:07+0000\n"
-"PO-Revision-Date: 2014-12-10 00:24+0000\n"
+"POT-Creation-Date: 2014-12-12 06:07+0000\n"
+"PO-Revision-Date: 2014-12-10 22:16+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/neutron/"
 "language/zh_TW/)\n"
@@ -37,16 +37,12 @@ msgstr "正在同步化狀態"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3_agent.py:1999
+#: neutron/agent/dhcp_agent.py:602 neutron/agent/l3/agent.py:1720
 #: neutron/services/metering/agents/metering_agent.py:281
 #, python-format
 msgid "agent_updated by server side %s!"
 msgstr "agent_updated 是由伺服器端 %s 執行！"
 
-#: neutron/agent/l3_agent.py:1901
-msgid "L3 agent started"
-msgstr "已啟動 L3 代理程式"
-
 #: neutron/agent/ovs_cleanup_util.py:74
 #, python-format
 msgid "Deleting port: %s"
@@ -108,6 +104,10 @@ msgstr "重新整理防火牆規則"
 msgid "No ports here to refresh firewall"
 msgstr ""
 
+#: neutron/agent/l3/agent.py:1622
+msgid "L3 agent started"
+msgstr "已啟動 L3 代理程式"
+
 #: neutron/agent/linux/interface.py:262 neutron/agent/linux/interface.py:317
 #: neutron/agent/linux/interface.py:380 neutron/agent/linux/interface.py:427
 #, python-format
@@ -1407,18 +1407,6 @@ msgstr ""
 msgid "Loading interface driver %s"
 msgstr ""
 
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:226
-#, python-format
-msgid ""
-"Mapped connection %(conn_id)s to Tunnel%(tunnel_id)d using IKE policy ID "
-"%(ike_id)d and IPSec policy ID %(ipsec_id)d"
-msgstr ""
-
-#: neutron/services/vpn/service_drivers/cisco_csr_db.py:238
-#, python-format
-msgid "Removed mapping for connection %s"
-msgstr ""
-
 #: neutron/tests/unit/vmware/apiclient/test_api_eventlet_request.py:62
 #, python-format
 msgid "spawned: %d"