From 059a8014558d0ae7aad07ac1f7f37aebaacb72cb Mon Sep 17 00:00:00 2001
From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Tue, 29 Apr 2014 06:49:06 +0000
Subject: [PATCH] Imported Translations from Transifex

Change-Id: I35439d61689c7190ab7f802f0f81326656261a3c
---
 neutron/locale/ar/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/bg_BG/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/bn_IN/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/bs/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/ca/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/cs/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/da/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/de/LC_MESSAGES/neutron.po    | 110 ++++++++-----------
 neutron/locale/el/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/en_AU/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/en_GB/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/en_US/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/es/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/es_MX/LC_MESSAGES/neutron.po | 113 +++++++++-----------
 neutron/locale/eu/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/eu_ES/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/fa/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/fi_FI/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/fil/LC_MESSAGES/neutron.po   | 105 ++++++++----------
 neutron/locale/fr/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/gl/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/he/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/he_IL/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/hi/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/hr/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/hu/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/id/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/is_IS/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/it/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/it_IT/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/ja/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/ka_GE/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/km/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/kn/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/ko/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/ko_KR/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/ml_IN/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/mr_IN/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/ms/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/nb/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/ne/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/neutron.pot                  | 107 ++++++++----------
 neutron/locale/nl_NL/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/pa_IN/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/pl_PL/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/pt/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/pt_BR/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/ro/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/ru/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/ru_RU/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/sk/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/sl_SI/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/sq/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/sr/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/sv/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/sw_KE/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/ta/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/te_IN/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/tl/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/tl_PH/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/tr_TR/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/uk/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/ur/LC_MESSAGES/neutron.po    | 105 ++++++++----------
 neutron/locale/vi_VN/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/zh_CN/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/zh_HK/LC_MESSAGES/neutron.po | 105 ++++++++----------
 neutron/locale/zh_TW/LC_MESSAGES/neutron.po | 105 ++++++++----------
 67 files changed, 2954 insertions(+), 4096 deletions(-)

diff --git a/neutron/locale/ar/LC_MESSAGES/neutron.po b/neutron/locale/ar/LC_MESSAGES/neutron.po
index 2cd361f8981..a02a2b5c77f 100644
--- a/neutron/locale/ar/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ar/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Arabic "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/bg_BG/LC_MESSAGES/neutron.po b/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
index 656248c8673..f5c25a2103d 100644
--- a/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
+++ b/neutron/locale/bg_BG/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/bn_IN/LC_MESSAGES/neutron.po b/neutron/locale/bn_IN/LC_MESSAGES/neutron.po
index 52a215ef3f8..bf14e7d195a 100644
--- a/neutron/locale/bn_IN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/bn_IN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Bengali (India) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/bs/LC_MESSAGES/neutron.po b/neutron/locale/bs/LC_MESSAGES/neutron.po
index 2365e948320..9fc0499f279 100644
--- a/neutron/locale/bs/LC_MESSAGES/neutron.po
+++ b/neutron/locale/bs/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Bosnian "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ca/LC_MESSAGES/neutron.po b/neutron/locale/ca/LC_MESSAGES/neutron.po
index 76c40b40744..72dfb2264bd 100644
--- a/neutron/locale/ca/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ca/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Catalan "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/cs/LC_MESSAGES/neutron.po b/neutron/locale/cs/LC_MESSAGES/neutron.po
index 3291b69c920..802108d01eb 100644
--- a/neutron/locale/cs/LC_MESSAGES/neutron.po
+++ b/neutron/locale/cs/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-25 11:40+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Czech "
@@ -2527,12 +2527,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4122,71 +4122,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Neplatný parametr: Unicode není současnou databází podporován."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "Výjimka DB zabalena."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "Připojení SQL selhalo. Zbývá %s pokusů."
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12221,7 +12204,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12409,80 +12392,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/da/LC_MESSAGES/neutron.po b/neutron/locale/da/LC_MESSAGES/neutron.po
index c9643e43a1d..e27afbd6aa9 100644
--- a/neutron/locale/da/LC_MESSAGES/neutron.po
+++ b/neutron/locale/da/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Ugyldig parameter: Unicode er ikke understøttet af den aktuelle database."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/de/LC_MESSAGES/neutron.po b/neutron/locale/de/LC_MESSAGES/neutron.po
index 01454441e09..01f0e43f8b1 100644
--- a/neutron/locale/de/LC_MESSAGES/neutron.po
+++ b/neutron/locale/de/LC_MESSAGES/neutron.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
-"PO-Revision-Date: 2014-04-24 12:53+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
+"PO-Revision-Date: 2014-04-26 08:35+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German "
 "(http://www.transifex.com/projects/p/neutron/language/de/)\n"
@@ -2615,12 +2615,12 @@ msgstr "Automatische Netzzuordnung zum DHCP-Agenten zulassen."
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "Datenbankregistrierungsausnahme: %s"
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4306,57 +4306,42 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 "Ungültiger Parameter: Unicode wird von der aktuellen Datenbank nicht "
 "unterstützt."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "Datenbankausnahme eingeschlossen."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr "Datenbankserver ist nicht mehr vorhanden: %s"
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-"Der \"MySQL Traditional Mode\" wurde von dieser Applikation nicht "
-"aktiviert. Dies kann zu unbemerkter Datenkorruption führen. Bitte "
-"ermuntern Sie die Applikationsentwickler diesen Modus zu aktivieren."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "SQL-Verbindung fehlgeschlagen. Noch %s weitere Versuche."
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "Der angegebene Sortierschlüssel war nicht gültig. "
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "ID nicht in 'sort_keys' enthalten; ist 'sort_keys' eindeutig?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "Unbekannte Sortierrichtung; muss 'desc' oder 'asc' sein"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
@@ -4366,7 +4351,7 @@ msgstr ""
 " ist erforderlich, denn der Typ dieser Spalte wird von sqlite nicht "
 "unterstützt."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
@@ -4376,12 +4361,7 @@ msgstr ""
 " für die Spalte column %s. Es sollte eine Instanz von sqlalchemy.Column "
 "sein."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr "Lösche doppelte Zeile mit der ID %(id)s aus der Tabelle %(table)s"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr "Nicht unterstützter Spaltentyp"
 
@@ -12558,7 +12538,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12768,80 +12748,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/el/LC_MESSAGES/neutron.po b/neutron/locale/el/LC_MESSAGES/neutron.po
index 9a43aae86ec..6f2ac64dddc 100644
--- a/neutron/locale/el/LC_MESSAGES/neutron.po
+++ b/neutron/locale/el/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Greek "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/en_AU/LC_MESSAGES/neutron.po b/neutron/locale/en_AU/LC_MESSAGES/neutron.po
index 4e99d9e54cb..aae8b059981 100644
--- a/neutron/locale/en_AU/LC_MESSAGES/neutron.po
+++ b/neutron/locale/en_AU/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (Australia) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4128,52 +4128,40 @@ msgstr ""
 "%(what)s is deprecated as of %(as_of)s and may be removed in "
 "%(remove_in)s. It will not be superseded."
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Invalid Parameter: Unicode is not supported by the current database."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "DB exception wrapped."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "SQL connection failed. %s attempts left."
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "Sort key supplied was not valid."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "Id not in sort_keys; is sort_keys unique?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "Unknown sort direction, must be 'desc' or 'asc'"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
@@ -4182,7 +4170,7 @@ msgstr ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
@@ -4191,12 +4179,7 @@ msgstr ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr "Deleting duplicated row with id: %(id)s from table: %(table)s"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr "Unsupported id columns type"
 
@@ -12239,7 +12222,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12427,80 +12410,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/en_GB/LC_MESSAGES/neutron.po b/neutron/locale/en_GB/LC_MESSAGES/neutron.po
index 775d1b30b67..e44b85cb624 100644
--- a/neutron/locale/en_GB/LC_MESSAGES/neutron.po
+++ b/neutron/locale/en_GB/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: English (United Kingdom) "
@@ -2529,12 +2529,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4126,52 +4126,40 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Invalid Parameter: Unicode is not supported by the current database."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "DB exception wrapped."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "SQL connection failed. %s attempts left."
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "Sort key supplied was not valid."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "Id not in sort_keys; is sort_keys unique?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "Unknown sort direction, must be 'desc' or 'asc'"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
@@ -4180,7 +4168,7 @@ msgstr ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
@@ -4189,12 +4177,7 @@ msgstr ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr "Deleting duplicated row with id: %(id)s from table: %(table)s"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr "Unsupported id columns type"
 
@@ -12237,7 +12220,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12425,80 +12408,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/en_US/LC_MESSAGES/neutron.po b/neutron/locale/en_US/LC_MESSAGES/neutron.po
index eff84a791dc..a29b23de2c7 100644
--- a/neutron/locale/en_US/LC_MESSAGES/neutron.po
+++ b/neutron/locale/en_US/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: English (United States) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/es/LC_MESSAGES/neutron.po b/neutron/locale/es/LC_MESSAGES/neutron.po
index 23a3da0ebe4..ab142fb82bb 100644
--- a/neutron/locale/es/LC_MESSAGES/neutron.po
+++ b/neutron/locale/es/LC_MESSAGES/neutron.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-23 08:06+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish "
@@ -2619,12 +2619,12 @@ msgstr "Permita la planificación automática de redes para el agente DHCP."
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "Excepción de registro de la base de datos: %s "
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4303,52 +4303,40 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Parámetro no válido: la base de datos actual no soporta Unicode."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "excepción DB empaquetada."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "La conexión SQL ha fallado. Quedan %s intentos."
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "La clave de clasificación proporcionada no es válida. "
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "Id no está en sort_keys; ¿es sort_keys exclusivo?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "Dirección de clasificación desconocida, debe ser 'desc' o ' asc'"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
@@ -4357,7 +4345,7 @@ msgstr ""
 "Especifique la columna %s en el parámetro col_name_col_instance. Es "
 "necesario porque la columna tiene un tipo no soportado por sqlite)."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
@@ -4366,12 +4354,7 @@ msgstr ""
 "col_name_col_instance param tiene el tipo incorrecto de instancia de "
 "columna para la columna %s. Debe ser una instancia de  sqlalchemy.Column."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr "Eliminando registro duplicado con id: %(id)s de la tabla: %(table)s"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr "Tipo de identificador de columnas no soportado"
 
@@ -12550,7 +12533,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12760,80 +12743,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/es_MX/LC_MESSAGES/neutron.po b/neutron/locale/es_MX/LC_MESSAGES/neutron.po
index 1677247b9a1..39e451ea436 100644
--- a/neutron/locale/es_MX/LC_MESSAGES/neutron.po
+++ b/neutron/locale/es_MX/LC_MESSAGES/neutron.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
-"PO-Revision-Date: 2014-04-07 06:32+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
+"PO-Revision-Date: 2014-04-27 22:00+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (Mexico) "
 "(http://www.transifex.com/projects/p/neutron/language/es_MX/)\n"
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -3976,7 +3976,7 @@ msgstr ""
 #: neutron/openstack/common/log.py:402
 #, python-format
 msgid "Error loading logging config %(log_config)s: %(err_msg)s"
-msgstr ""
+msgstr "Error al cargar configuración de entrada %(log_config)s: %(err_msg)s"
 
 #: neutron/openstack/common/log.py:453
 #, python-format
@@ -3986,7 +3986,7 @@ msgstr ""
 #: neutron/openstack/common/log.py:623
 #, python-format
 msgid "Fatal call to deprecated config: %(msg)s"
-msgstr ""
+msgstr "Llamado crítico de configuración en desuso ; %(msg)s"
 
 #: neutron/openstack/common/loopingcall.py:82
 #, python-format
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
-msgstr ""
+msgstr "Parámetro inválido : Unicode no está soportado por la base de datos actual"
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/eu/LC_MESSAGES/neutron.po b/neutron/locale/eu/LC_MESSAGES/neutron.po
index 9fd59ef5782..48438f1ead0 100644
--- a/neutron/locale/eu/LC_MESSAGES/neutron.po
+++ b/neutron/locale/eu/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Basque "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/eu_ES/LC_MESSAGES/neutron.po b/neutron/locale/eu_ES/LC_MESSAGES/neutron.po
index 1d21cda6334..692b77152af 100644
--- a/neutron/locale/eu_ES/LC_MESSAGES/neutron.po
+++ b/neutron/locale/eu_ES/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2013-11-15 02:27+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Basque (Spain) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/fa/LC_MESSAGES/neutron.po b/neutron/locale/fa/LC_MESSAGES/neutron.po
index f11f86f8086..2f2150a934e 100644
--- a/neutron/locale/fa/LC_MESSAGES/neutron.po
+++ b/neutron/locale/fa/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Persian "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/fi_FI/LC_MESSAGES/neutron.po b/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
index 06f55ed4158..0a30c32bcd9 100644
--- a/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
+++ b/neutron/locale/fi_FI/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Finnish (Finland) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/fil/LC_MESSAGES/neutron.po b/neutron/locale/fil/LC_MESSAGES/neutron.po
index bc6b5070a11..99f2704018b 100644
--- a/neutron/locale/fil/LC_MESSAGES/neutron.po
+++ b/neutron/locale/fil/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Filipino "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/fr/LC_MESSAGES/neutron.po b/neutron/locale/fr/LC_MESSAGES/neutron.po
index a4bb6438658..b814bd00f4d 100644
--- a/neutron/locale/fr/LC_MESSAGES/neutron.po
+++ b/neutron/locale/fr/LC_MESSAGES/neutron.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:33+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -2623,12 +2623,12 @@ msgstr "Autorise la planification automatique des réseaux de l'agent DHCP."
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "Exception d'enregistrement de base de données : %s"
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4319,52 +4319,40 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Paramètre invalide: La base de donnée ne supporte pas Unicode."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "Exception BD encapsulée."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr "Le serveur de base de données a disparu: %s"
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "Echec de connexion SQL. %s essais restants."
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "Clé de tri fournie invalide."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "ID absent de sort_keys ; sort_keys unique ?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "Sens de tri inconnu, doit être 'desc' ou 'asc'"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
@@ -4373,7 +4361,7 @@ msgstr ""
 "Spécifiez la colonne %s dans le paramètre col_name_col_instance. Ceci est"
 " obligatoire car la colonne a un type non pris en charge dans sqlite)."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
@@ -4383,12 +4371,7 @@ msgstr ""
 " incorrect pour la colonne %s. Il devrait être une instance de "
 "sqlalchemy.Column."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr "Suppression ligne en double avec l'ID : %(id)s de la table : %(table)s"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr "Type de colonnes id non pris en charge"
 
@@ -12562,7 +12545,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12776,80 +12759,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/gl/LC_MESSAGES/neutron.po b/neutron/locale/gl/LC_MESSAGES/neutron.po
index 219018d2ed3..ab7b2f0dd43 100644
--- a/neutron/locale/gl/LC_MESSAGES/neutron.po
+++ b/neutron/locale/gl/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Galician "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/he/LC_MESSAGES/neutron.po b/neutron/locale/he/LC_MESSAGES/neutron.po
index 67d05daae20..17da11b6922 100644
--- a/neutron/locale/he/LC_MESSAGES/neutron.po
+++ b/neutron/locale/he/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hebrew "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/he_IL/LC_MESSAGES/neutron.po b/neutron/locale/he_IL/LC_MESSAGES/neutron.po
index a9818e78c48..359e2f455a8 100644
--- a/neutron/locale/he_IL/LC_MESSAGES/neutron.po
+++ b/neutron/locale/he_IL/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hebrew (Israel) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/hi/LC_MESSAGES/neutron.po b/neutron/locale/hi/LC_MESSAGES/neutron.po
index 839c5c8df41..5e7d7f58c20 100644
--- a/neutron/locale/hi/LC_MESSAGES/neutron.po
+++ b/neutron/locale/hi/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hindi "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/hr/LC_MESSAGES/neutron.po b/neutron/locale/hr/LC_MESSAGES/neutron.po
index 9aabc7a5bea..7f16f9c1c83 100644
--- a/neutron/locale/hr/LC_MESSAGES/neutron.po
+++ b/neutron/locale/hr/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Croatian "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/hu/LC_MESSAGES/neutron.po b/neutron/locale/hu/LC_MESSAGES/neutron.po
index b96bc02acbb..f81a677ff02 100644
--- a/neutron/locale/hu/LC_MESSAGES/neutron.po
+++ b/neutron/locale/hu/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Hungarian "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/id/LC_MESSAGES/neutron.po b/neutron/locale/id/LC_MESSAGES/neutron.po
index c54c0381f18..62c0aa30a56 100644
--- a/neutron/locale/id/LC_MESSAGES/neutron.po
+++ b/neutron/locale/id/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Indonesian "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/is_IS/LC_MESSAGES/neutron.po b/neutron/locale/is_IS/LC_MESSAGES/neutron.po
index 9560862c672..2d6d1544c5f 100644
--- a/neutron/locale/is_IS/LC_MESSAGES/neutron.po
+++ b/neutron/locale/is_IS/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Icelandic (Iceland) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/it/LC_MESSAGES/neutron.po b/neutron/locale/it/LC_MESSAGES/neutron.po
index c3904e12b1e..116d72bc9e0 100644
--- a/neutron/locale/it/LC_MESSAGES/neutron.po
+++ b/neutron/locale/it/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:33+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -2600,12 +2600,12 @@ msgstr "Consenti pianificazione automatica delle reti nell'agent DHCP."
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "Eccezione nella registrazione del database: %s"
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4273,52 +4273,40 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Parametro non valido: Unicode non è supportato dal database corrente."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "Eccezione DB con wrapper."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "Connessione SQL non riuscita. Sono rimasti %s tentativi."
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "La chiave di ordinamento fornita non è valida."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "Id non è presente in sort_keys; è sort_keys univoco?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "Direzione ordinamento sconosciuta, deve essere 'desc' o 'asc'"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
@@ -4327,7 +4315,7 @@ msgstr ""
 "Specificar la colonna %s nel parametro col_name_col_instance. È richiesto"
 " perché la colonna ha un tipo non supportato da sqlite)."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
@@ -4336,12 +4324,7 @@ msgstr ""
 "Il parametro col_name_col_instance ha un tipo errato di istanza della "
 "colonna per la colonna %s. Deve essere l'istanza di sqlalchemy.Column."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12499,7 +12482,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12713,80 +12696,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/it_IT/LC_MESSAGES/neutron.po b/neutron/locale/it_IT/LC_MESSAGES/neutron.po
index ac005ad8fe6..4f08887af53 100644
--- a/neutron/locale/it_IT/LC_MESSAGES/neutron.po
+++ b/neutron/locale/it_IT/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (Italy) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ja/LC_MESSAGES/neutron.po b/neutron/locale/ja/LC_MESSAGES/neutron.po
index 44dc9ee746c..c362ad87aff 100644
--- a/neutron/locale/ja/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ja/LC_MESSAGES/neutron.po
@@ -10,7 +10,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:33+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese "
@@ -2539,12 +2539,12 @@ msgstr "DHCP エージェントに対するネットワークの自動スケジ
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "データベース登録例外: %s"
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4156,52 +4156,40 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "無効なパラメーター: ユニコードは現在のデータベースではサポートされていません。"
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "DB 例外が包み込まれました。"
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "SQL 接続が失敗しました。残りの試行回数は %s です。"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "指定されたソート・キーが無効でした。"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "sort_keys に ID がありません。sort_keys は固有ですか?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "ソート方向が不明です。'desc' または 'asc' でなければなりません"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
@@ -4210,7 +4198,7 @@ msgstr ""
 "col_name_col_instance パラメーターに列 %s を指定してください。これは、列に、sqlite) "
 "によってサポートされないタイプがあるために必要です。"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
@@ -4219,12 +4207,7 @@ msgstr ""
 "col_name_col_instance パラメーターに、列 %s では正しくないタイプの列インスタンスがあります。これは "
 "sqlalchemy.Column のインスタンスでなければなりません。"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12293,7 +12276,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12487,80 +12470,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ka_GE/LC_MESSAGES/neutron.po b/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
index e338fd3274b..2fd6eb970a4 100644
--- a/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ka_GE/LC_MESSAGES/neutron.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Georgian (Georgia) "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/km/LC_MESSAGES/neutron.po b/neutron/locale/km/LC_MESSAGES/neutron.po
index 2c32cbc9ef6..404a111d6d1 100644
--- a/neutron/locale/km/LC_MESSAGES/neutron.po
+++ b/neutron/locale/km/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Khmer "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/kn/LC_MESSAGES/neutron.po b/neutron/locale/kn/LC_MESSAGES/neutron.po
index 4d2ad5f43e7..844fbffdfd6 100644
--- a/neutron/locale/kn/LC_MESSAGES/neutron.po
+++ b/neutron/locale/kn/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Kannada "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ko/LC_MESSAGES/neutron.po b/neutron/locale/ko/LC_MESSAGES/neutron.po
index 397ca7097da..af664498ebc 100644
--- a/neutron/locale/ko/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ko/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Korean "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ko_KR/LC_MESSAGES/neutron.po b/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
index fa12a7396d5..3ab095dc8a0 100644
--- a/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ko_KR/LC_MESSAGES/neutron.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:33+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) "
@@ -2544,12 +2544,12 @@ msgstr "DHCP 에이전트에 대한 네트워크 자동 스케줄링을 허용
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "데이터베이스 등록 예외: %s"
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4160,52 +4160,40 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "올바르지 않은 매개변수: Unicode는 현재 데이터베이스에서 지원되지 않습니다. "
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "DB 예외가 랩핑되었습니다."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "SQL 연결에 실패했습니다. %s번의 시도가 남았습니다. "
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "제공되는 정렬 키가 올바르지 않습니다. "
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "ID가 sort_keys에 없습니다. sort_keys가 고유합니까?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "알 수 없는 정렬 방향입니다. 'desc' 또는 'asc'여야 함"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
@@ -4214,7 +4202,7 @@ msgstr ""
 "col_name_col_instance 매개변수에 %s 열을 지정하십시오. sqlite에서 지원하지 않는 유형이 열에 있으므로 이는"
 " 필수입니다."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
@@ -4223,12 +4211,7 @@ msgstr ""
 "%s 열에 올바르지 않은 열 인스턴스 유형이 col_name_col_instance 매개변수에 있습니다. "
 "sqlalchemy.Column의 인스턴스여야 합니다."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12302,7 +12285,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12498,80 +12481,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ml_IN/LC_MESSAGES/neutron.po b/neutron/locale/ml_IN/LC_MESSAGES/neutron.po
index 7f8fa4e5f94..23c73027b3c 100644
--- a/neutron/locale/ml_IN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ml_IN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malayalam (India) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/mr_IN/LC_MESSAGES/neutron.po b/neutron/locale/mr_IN/LC_MESSAGES/neutron.po
index b7a8b0075ce..d39d9607d6c 100644
--- a/neutron/locale/mr_IN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/mr_IN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Marathi (India) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ms/LC_MESSAGES/neutron.po b/neutron/locale/ms/LC_MESSAGES/neutron.po
index 97d14cbb992..595fd539f67 100644
--- a/neutron/locale/ms/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ms/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Malay "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/nb/LC_MESSAGES/neutron.po b/neutron/locale/nb/LC_MESSAGES/neutron.po
index dbee4fedab2..db9a5ef95e8 100644
--- a/neutron/locale/nb/LC_MESSAGES/neutron.po
+++ b/neutron/locale/nb/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Norwegian Bokmål "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ne/LC_MESSAGES/neutron.po b/neutron/locale/ne/LC_MESSAGES/neutron.po
index 56d65cc34ac..347a9ac7e63 100644
--- a/neutron/locale/ne/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ne/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Nepali "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index 4de0c9e9852..ce2d47990c0 100644
--- a/neutron/locale/neutron.pot
+++ b/neutron/locale/neutron.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2014.2.dev300.ge8114d1\n"
+"Project-Id-Version: neutron 2014.2.dev310.g5e5b607\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+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"
@@ -2524,12 +2524,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4119,71 +4119,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12214,7 +12197,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12402,80 +12385,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/nl_NL/LC_MESSAGES/neutron.po b/neutron/locale/nl_NL/LC_MESSAGES/neutron.po
index ebbbee8d335..8808374274d 100644
--- a/neutron/locale/nl_NL/LC_MESSAGES/neutron.po
+++ b/neutron/locale/nl_NL/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Dutch (Netherlands) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/pa_IN/LC_MESSAGES/neutron.po b/neutron/locale/pa_IN/LC_MESSAGES/neutron.po
index 1190a4f3c58..aa9491609d2 100644
--- a/neutron/locale/pa_IN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/pa_IN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Panjabi (Punjabi) (India) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/pl_PL/LC_MESSAGES/neutron.po b/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
index a69fa76547c..26fd71f0e69 100644
--- a/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
+++ b/neutron/locale/pl_PL/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 11:10+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Polish (Poland) "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/pt/LC_MESSAGES/neutron.po b/neutron/locale/pt/LC_MESSAGES/neutron.po
index 7a81e902197..ddde2668ce7 100644
--- a/neutron/locale/pt/LC_MESSAGES/neutron.po
+++ b/neutron/locale/pt/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4123,71 +4123,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Parâmetro Inválido: o Unicode não é suportado pela base de dados atual."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "A ligação SQL falhou. Tentativas restantes: %s ."
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr "Id. do tipo de colunas não suportada"
 
@@ -12228,7 +12211,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12416,80 +12399,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/pt_BR/LC_MESSAGES/neutron.po b/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
index 897321b78aa..fbedfc5bb57 100644
--- a/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
+++ b/neutron/locale/pt_BR/LC_MESSAGES/neutron.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-15 02:50+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) "
@@ -2648,12 +2648,12 @@ msgstr "Permitir o planejamento automático de redes para o agente DHCP."
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr "Número de agentes DHCP agendado para hospedar uma rede."
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "Exceção de registro do banco de dados: %s"
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr "Exceção de base de dados"
 
@@ -4337,52 +4337,40 @@ msgstr ""
 "%(what)s está deprecado desde %(as_of)s e pode ser removido em "
 "%(remove_in)s. Ele não será substituído."
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Parâmetro inválido: Unicode não é suportado pela base de dados atual."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "Exceção de base de dados incluída."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "Conexáo SQL falhou, %s tentativas restantes."
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "Chave de ordenação fornecida não era válida."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "ID não encontrado em sort_keys; é sort_keys único?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "Direção de ordenação desconhecida, deve ser 'desc' ou 'asc'"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
@@ -4391,7 +4379,7 @@ msgstr ""
 "Especifique a coluna %s no parâmetro 'col_name_col_instance. Isso é "
 "necessário porque a coluna possui um tipo não suportado por sqlite)."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
@@ -4400,12 +4388,7 @@ msgstr ""
 "O parâmetro col_name_col_instance possui um tipo errado de instância da "
 "coluna para a coluna %s. Deveria ser uma instância de sqlalchemy.Column."
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr "Excluindo linha duplicada com ID: %(id)s da tabela: %(table)s"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr "Tipo de colunas ID não suportado"
 
@@ -12714,7 +12697,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12924,80 +12907,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ro/LC_MESSAGES/neutron.po b/neutron/locale/ro/LC_MESSAGES/neutron.po
index 5a2ff1c923f..cf85eda2226 100644
--- a/neutron/locale/ro/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ro/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Romanian "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ru/LC_MESSAGES/neutron.po b/neutron/locale/ru/LC_MESSAGES/neutron.po
index b896af2090d..88661034aa4 100644
--- a/neutron/locale/ru/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ru/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -2532,12 +2532,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4127,71 +4127,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "Недопустимый параметр: Unicode не поддерживается используемой базой данных"
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "Исключение БД скрыто."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12228,7 +12211,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12416,80 +12399,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ru_RU/LC_MESSAGES/neutron.po b/neutron/locale/ru_RU/LC_MESSAGES/neutron.po
index b99e740adf5..6cf3cb0bf06 100644
--- a/neutron/locale/ru_RU/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ru_RU/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Russian (Russia) "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/sk/LC_MESSAGES/neutron.po b/neutron/locale/sk/LC_MESSAGES/neutron.po
index 7f4ca039d03..c10ba142585 100644
--- a/neutron/locale/sk/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sk/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Slovak "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/sl_SI/LC_MESSAGES/neutron.po b/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
index af2638aa16b..489c6751f39 100644
--- a/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sl_SI/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Slovenian (Slovenia) "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/sq/LC_MESSAGES/neutron.po b/neutron/locale/sq/LC_MESSAGES/neutron.po
index 212d36b99fb..7ac98ff5478 100644
--- a/neutron/locale/sq/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sq/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Albanian "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/sr/LC_MESSAGES/neutron.po b/neutron/locale/sr/LC_MESSAGES/neutron.po
index 4e0ad53d8d5..142e1ec0470 100644
--- a/neutron/locale/sr/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sr/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Serbian "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/sv/LC_MESSAGES/neutron.po b/neutron/locale/sv/LC_MESSAGES/neutron.po
index 0f4554d6fc8..040e13aa3b2 100644
--- a/neutron/locale/sv/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sv/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Swedish "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/sw_KE/LC_MESSAGES/neutron.po b/neutron/locale/sw_KE/LC_MESSAGES/neutron.po
index d08f92f9cf0..b6a255d6601 100644
--- a/neutron/locale/sw_KE/LC_MESSAGES/neutron.po
+++ b/neutron/locale/sw_KE/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Swahili (Kenya) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ta/LC_MESSAGES/neutron.po b/neutron/locale/ta/LC_MESSAGES/neutron.po
index 76e26c5b974..355e414d943 100644
--- a/neutron/locale/ta/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ta/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Tamil "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/te_IN/LC_MESSAGES/neutron.po b/neutron/locale/te_IN/LC_MESSAGES/neutron.po
index 77ec7e57401..c025b4760e2 100644
--- a/neutron/locale/te_IN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/te_IN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Telugu (India) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/tl/LC_MESSAGES/neutron.po b/neutron/locale/tl/LC_MESSAGES/neutron.po
index ce98ffc40c4..b7e9bc961a5 100644
--- a/neutron/locale/tl/LC_MESSAGES/neutron.po
+++ b/neutron/locale/tl/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Tagalog "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/tl_PH/LC_MESSAGES/neutron.po b/neutron/locale/tl_PH/LC_MESSAGES/neutron.po
index 887883d5acd..15fbb9304e4 100644
--- a/neutron/locale/tl_PH/LC_MESSAGES/neutron.po
+++ b/neutron/locale/tl_PH/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2013-09-28 05:40+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Tagalog (Philippines) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/tr_TR/LC_MESSAGES/neutron.po b/neutron/locale/tr_TR/LC_MESSAGES/neutron.po
index d167ac2ccdc..5f021489fdc 100644
--- a/neutron/locale/tr_TR/LC_MESSAGES/neutron.po
+++ b/neutron/locale/tr_TR/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Turkish (Turkey) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "Veritabanı istisnası yakalandı."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/uk/LC_MESSAGES/neutron.po b/neutron/locale/uk/LC_MESSAGES/neutron.po
index 7ee7ca4da10..73a7dc5e164 100644
--- a/neutron/locale/uk/LC_MESSAGES/neutron.po
+++ b/neutron/locale/uk/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Ukrainian "
@@ -2526,12 +2526,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4121,71 +4121,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12216,7 +12199,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12404,80 +12387,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/ur/LC_MESSAGES/neutron.po b/neutron/locale/ur/LC_MESSAGES/neutron.po
index 9ec1853bec8..bb5771f9d1a 100644
--- a/neutron/locale/ur/LC_MESSAGES/neutron.po
+++ b/neutron/locale/ur/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Urdu "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/vi_VN/LC_MESSAGES/neutron.po b/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
index 891980469b5..73e2bf82d92 100644
--- a/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/vi_VN/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,73 +4120,56 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 "Thông số không hợp lệ: Unicode hiện chưa được hỗ trợ bởi hệ cơ sở dữ liệu"
 " hiện tại."
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "Lỗi exception DB khi bao bọc."
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12217,7 +12200,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12405,80 +12388,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/zh_CN/LC_MESSAGES/neutron.po b/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
index fedff89bfe2..bbd95a52773 100644
--- a/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
+++ b/neutron/locale/zh_CN/LC_MESSAGES/neutron.po
@@ -11,7 +11,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-24 16:30+0000\n"
 "Last-Translator: Dandanmylady <Dandanmylady@gmail.com>\n"
 "Language-Team: Chinese (China) "
@@ -2534,12 +2534,12 @@ msgstr "允许自动对 DHCP 代理调度网络。"
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr "已经调度到一个主机网络的DHCP代理数量"
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "发生数据库注册异常:%s"
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4135,71 +4135,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "参数无效:当前数据库不支持 Unicode。"
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "数据库异常被包裹。"
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr "数据库服务器已不存在: %s"
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr "这一应用尚未打开MySQL传统模式,这意味着可能发生沉默数据损坏。请鼓励应用开发者打开这一模式。"
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "SQL 连接失败。还可进行 %s 次尝试。"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "提供的排序键无效。"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "标识未在 sort_keys 中,sort_keys 唯一吗?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "排序方向未知,必须为“降序”或“升序”"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr "请在 col_name_col_instance 参数中指定列 %s。要求执行此操作的原因是列中包含不受 sqlite 支持的类型)。"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr "对于列 %s,col_name_col_instance 参数具有不正确类型的列实例。它应该是 sqlalchemy.Column 的实例。"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr "正在从表 %(table)s 中删除具有id %(id)s 的重复行"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr "不支持的id列类型"
 
@@ -12253,7 +12236,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12441,80 +12424,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/zh_HK/LC_MESSAGES/neutron.po b/neutron/locale/zh_HK/LC_MESSAGES/neutron.po
index 81ce10374b9..042b9055c0a 100644
--- a/neutron/locale/zh_HK/LC_MESSAGES/neutron.po
+++ b/neutron/locale/zh_HK/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Hong Kong) "
@@ -2525,12 +2525,12 @@ msgstr ""
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4120,71 +4120,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr ""
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12215,7 +12198,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12403,80 +12386,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""
diff --git a/neutron/locale/zh_TW/LC_MESSAGES/neutron.po b/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
index 5f3e9d42dc0..9880c41cff7 100644
--- a/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
+++ b/neutron/locale/zh_TW/LC_MESSAGES/neutron.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2014-04-26 06:48+0000\n"
+"POT-Creation-Date: 2014-04-29 06:46+0000\n"
 "PO-Revision-Date: 2014-04-07 06:32+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Taiwan) "
@@ -2530,12 +2530,12 @@ msgstr "容許自動將網路排程到 DHCP 代理程式。"
 msgid "Number of DHCP agents scheduled to host a network."
 msgstr ""
 
-#: neutron/db/api.py:55
+#: neutron/db/api.py:77
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "資料庫登錄異常狀況:%s"
 
-#: neutron/db/api.py:66
+#: neutron/db/api.py:89
 msgid "Database exception"
 msgstr ""
 
@@ -4133,71 +4133,54 @@ msgid ""
 "%(remove_in)s. It will not be superseded."
 msgstr ""
 
-#: neutron/openstack/common/db/api.py:97
-msgid "DB exceeded retry limit."
-msgstr ""
-
-#: neutron/openstack/common/db/api.py:101
-msgid "DB connection error."
-msgstr ""
-
 #: neutron/openstack/common/db/exception.py:44
 msgid "Invalid Parameter: Unicode is not supported by the current database."
 msgstr "無效參數:現行資料庫不支援 Unicode。"
 
-#: neutron/openstack/common/db/sqlalchemy/session.py:618
-msgid "DB exception wrapped."
-msgstr "已覆蓋 DB 異常狀況。"
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:687
-#, python-format
-msgid "Database server has gone away: %s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:779
-msgid ""
-"This application has not enabled MySQL traditional mode, which means "
-"silent data corruption may occur. Please encourage the application "
-"developers to enable this mode."
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/session.py:804
-#, python-format
-msgid "SQL connection failed. %s attempts left."
-msgstr "SQL 連線失敗。還可以嘗試 %s 次。"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:57
+#: neutron/openstack/common/db/sqlalchemy/utils.py:58
 msgid "Sort key supplied was not valid."
 msgstr "提供的排序鍵無效。"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:96
-msgid "Id not in sort_keys; is sort_keys unique?"
-msgstr "ID 不在 sort_keys 中;sort_keys 是唯一的嗎?"
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:118
+#: neutron/openstack/common/db/sqlalchemy/utils.py:119
 msgid "Unknown sort direction, must be 'desc' or 'asc'"
 msgstr "不明的排序方向,必須為 'desc' 或 'asc'"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:193
+#: neutron/openstack/common/db/sqlalchemy/utils.py:162
+#, python-format
+msgid ""
+"There is no `deleted` column in `%s` table. Project doesn't use soft-"
+"deleted feature."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:174
+#, python-format
+msgid "Unrecognized read_deleted value '%s'"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:181
+#, python-format
+msgid "There is no `project_id` column in `%s` table."
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:243
+msgid "model should be a subclass of ModelBase"
+msgstr ""
+
+#: neutron/openstack/common/db/sqlalchemy/utils.py:286
 #, python-format
 msgid ""
 "Please specify column %s in col_name_col_instance param. It is required "
 "because column has unsupported type by sqlite)."
 msgstr "請在 col_name_col_instance 參數中指定直欄 %s。它是必要的,因為直欄具有不受 SQLite 支援的類型。"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:199
+#: neutron/openstack/common/db/sqlalchemy/utils.py:292
 #, python-format
 msgid ""
 "col_name_col_instance param has wrong type of column instance for column "
 "%s It should be instance of sqlalchemy.Column."
 msgstr "col_name_col_instance 參數的直欄 %s 具有錯誤類型的直欄實例。它應該是 sqlalchemy.Column 的實例。"
 
-#: neutron/openstack/common/db/sqlalchemy/utils.py:279
-#, python-format
-msgid "Deleting duplicated row with id: %(id)s from table: %(table)s"
-msgstr ""
-
-#: neutron/openstack/common/db/sqlalchemy/utils.py:300
+#: neutron/openstack/common/db/sqlalchemy/utils.py:400
 msgid "Unsupported id columns type"
 msgstr ""
 
@@ -12252,7 +12235,7 @@ msgid "NSX identifiers for neutron security group %s not yet stored in Neutron D
 msgstr ""
 
 #: neutron/plugins/vmware/dbexts/lsn_db.py:86
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:70
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:71
 #, python-format
 msgid "Unable to find Logical Service Node for network %s"
 msgstr ""
@@ -12440,80 +12423,80 @@ msgstr ""
 msgid "Monitor Resource binding with id:%s not found!"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:39
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:40
 msgid ""
 "Pull LSN information from NSX in case it is missing from the local data "
 "store. This is useful to rebuild the local store in case of server "
 "recovery."
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:81
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:82
 #, python-format
 msgid "Unable to create LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:89
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:90
 #, python-format
 msgid "Unable to delete Logical Service Node %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:106
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:107
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and subnet "
 "%(subnet_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:128
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:129
 #, python-format
 msgid ""
 "Unable to find Logical Service Node Port for LSN %(lsn_id)s and mac "
 "address %(mac)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:148
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:149
 #, python-format
 msgid "Unable to create port for LSN  %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:156
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:157
 #, python-format
 msgid "Unable to delete LSN Port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:173
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:174
 #, python-format
 msgid "Metadata port not found while attempting to delete it from network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:176
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:177
 #, python-format
 msgid "Unable to find Logical Services Node Port with MAC %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:257
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:262
 #, python-format
 msgid ""
 "Unable to configure dhcp for Logical Service Node %(lsn_id)s and port "
 "%(lsn_port_id)s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:278
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:283
 #, python-format
 msgid "Unable to configure metadata for subnet %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:301
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:306
 #, python-format
 msgid "Error while configuring LSN port %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:373
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:378
 #, python-format
 msgid "Unable to save LSN for network %s"
 msgstr ""
 
-#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:439
+#: neutron/plugins/vmware/dhcp_meta/lsnmanager.py:444
 #, python-format
 msgid "Unable to save LSN port for subnet %s"
 msgstr ""