From: OpenStack Proposal Bot <openstack-infra@lists.openstack.org>
Date: Sun, 10 May 2015 06:15:11 +0000 (+0000)
Subject: Imported Translations from Transifex
X-Git-Url: https://review.fuel-infra.org/gitweb?a=commitdiff_plain;h=62ccf394c21eed132277b87b2428632efb07f1b0;p=openstack-build%2Fneutron-build.git

Imported Translations from Transifex

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

Change-Id: I879a3f7c7b0e970c91ef23b118f09ade99ceffc2
---

diff --git a/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po b/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po
index d4b9f10b6..93304dd9c 100644
--- a/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po
@@ -9,7 +9,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-04 06:08+0000\n"
+"POT-Creation-Date: 2015-05-10 06:14+0000\n"
 "PO-Revision-Date: 2015-04-28 07:35+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/neutron/language/"
@@ -342,6 +342,10 @@ msgstr ""
 "Récupération du réseau local virtuel = %(vlan_id)s à partir de net-id = "
 "%(net_uuid)s"
 
+#, python-format
+msgid "Configuration for device %s completed."
+msgstr "Configuration complète de l'équipement %s"
+
 #, python-format
 msgid "Adding %s to list of bridges."
 msgstr "Ajout %s à la liste de ponts."
@@ -350,10 +354,6 @@ msgstr "Ajout %s à la liste de ponts."
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr "Mappage du réseau physique %(physical_network)s sur le pont %(bridge)s"
 
-#, python-format
-msgid "Configuration for device %s completed."
-msgstr "Configuration complète de l'équipement %s"
-
 #, python-format
 msgid "Ancillary Port %s added"
 msgstr "Port auxiliaire %s ajouté"
diff --git a/neutron/locale/neutron-log-info.pot b/neutron/locale/neutron-log-info.pot
index 0f6dea21d..b890cee16 100644
--- a/neutron/locale/neutron-log-info.pot
+++ b/neutron/locale/neutron-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.2.dev227\n"
+"Project-Id-Version: neutron 2015.2.0.dev319\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-29 06:13+0000\n"
+"POT-Creation-Date: 2015-05-10 06:14+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"
@@ -39,13 +39,13 @@ msgid ""
 "policy:%(old_policy)s"
 msgstr ""
 
-#: neutron/quota.py:215
+#: neutron/quota.py:217
 msgid ""
 "ConfDriver is used as quota_driver because the loaded plugin does not "
 "support 'quotas' table."
 msgstr ""
 
-#: neutron/quota.py:220
+#: neutron/quota.py:228
 #, python-format
 msgid "Loaded quota_driver: %s."
 msgstr ""
@@ -83,42 +83,42 @@ msgstr ""
 msgid "Disabled allowed-address-pairs extension."
 msgstr ""
 
-#: neutron/agent/securitygroups_rpc.py:135
+#: neutron/agent/securitygroups_rpc.py:154
 #, python-format
 msgid ""
 "Skipping method %s as firewall is disabled or configured as "
 "NoopFirewallDriver."
 msgstr ""
 
-#: neutron/agent/securitygroups_rpc.py:147
+#: neutron/agent/securitygroups_rpc.py:166
 #, python-format
 msgid "Preparing filters for devices %s"
 msgstr ""
 
-#: neutron/agent/securitygroups_rpc.py:177
+#: neutron/agent/securitygroups_rpc.py:197
 #, python-format
 msgid "Security group rule updated %r"
 msgstr ""
 
-#: neutron/agent/securitygroups_rpc.py:184
+#: neutron/agent/securitygroups_rpc.py:204
 #, python-format
 msgid "Security group member updated %r"
 msgstr ""
 
-#: neutron/agent/securitygroups_rpc.py:206
+#: neutron/agent/securitygroups_rpc.py:226
 msgid "Provider rule updated"
 msgstr ""
 
-#: neutron/agent/securitygroups_rpc.py:218
+#: neutron/agent/securitygroups_rpc.py:238
 #, python-format
 msgid "Remove device filter for %r"
 msgstr ""
 
-#: neutron/agent/securitygroups_rpc.py:228
+#: neutron/agent/securitygroups_rpc.py:248
 msgid "Refresh firewall rules"
 msgstr ""
 
-#: neutron/agent/securitygroups_rpc.py:232
+#: neutron/agent/securitygroups_rpc.py:252
 msgid "No ports here to refresh firewall"
 msgstr ""
 
@@ -223,8 +223,8 @@ msgstr ""
 
 #: neutron/cmd/eventlet/plugins/hyperv_neutron_agent.py:43
 #: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:261
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1017
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1728
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1025
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1788
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:345
 msgid "Agent initialized successfully, now running... "
 msgstr ""
@@ -301,7 +301,7 @@ msgstr ""
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1603 neutron/plugins/ml2/plugin.py:889
+#: neutron/db/db_base_plugin_v2.py:1616 neutron/plugins/ml2/plugin.py:889
 #, python-format
 msgid ""
 "Found port (%(port_id)s, %(ip)s) having IP allocation on subnet "
@@ -314,22 +314,22 @@ msgid ""
 "rescheduling is disabled."
 msgstr ""
 
-#: neutron/db/l3_db.py:1173
+#: neutron/db/l3_db.py:1160
 #, python-format
 msgid "Skipping port %s as no IP is configure on it"
 msgstr ""
 
-#: neutron/db/l3_dvr_db.py:86
+#: neutron/db/l3_dvr_db.py:87
 #, python-format
 msgid "Centralizing distributed router %s is not supported"
 msgstr ""
 
-#: neutron/db/l3_dvr_db.py:543
+#: neutron/db/l3_dvr_db.py:549
 #, python-format
 msgid "Agent Gateway port does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvr_db.py:626
+#: neutron/db/l3_dvr_db.py:632
 #, python-format
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
@@ -552,50 +552,50 @@ msgstr ""
 msgid "Controller IPs: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:793
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:801
 #: neutron/plugins/oneconvergence/agent/nvsd_neutron_agent.py:89
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:99
 #, python-format
 msgid "RPC agent_id: %s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:863
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1245
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:871
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1308
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:209
 #, python-format
 msgid "Port %(device)s updated. Details: %(details)s"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:896
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:904
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:903
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1303
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1320
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:911
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1355
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1372
 #, python-format
 msgid "Attachment %s removed"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:915
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1332
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:923
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1384
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:235
 #, python-format
 msgid "Port %s updated."
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:968
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:976
 msgid "LinuxBridge Agent RPC Daemon Started!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:978
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1521
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:986
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1577
 #: neutron/plugins/sriovnicagent/sriov_nic_agent.py:251
 msgid "Agent out of sync with plugin!"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1012
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:1020
 #: neutron/plugins/ml2/drivers/mlnx/agent/eswitch_neutron_agent.py:43
 #, python-format
 msgid "Interface mappings: %s"
@@ -817,61 +817,61 @@ msgstr ""
 msgid "L2 Agent operating in DVR Mode with MAC %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:526
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:550
 #, python-format
 msgid "Assigning %(vlan_id)s as local vlan for net-id=%(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:627
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:651
 #, python-format
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:717
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
+#, python-format
+msgid "Configuration for device %s completed."
+msgstr ""
+
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:774
 #, python-format
 msgid ""
 "Skipping ARP spoofing rules for port '%s' because it has port security "
 "disabled"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:764
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:823
 #, python-format
 msgid "port_unbound(): net_uuid %s not in local_vlan_map"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:833
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:892
 #, python-format
 msgid "Adding %s to list of bridges."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:976
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1035
 #, python-format
 msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1125
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1184
 #, python-format
 msgid "Port '%(port_name)s' has lost its vlan tag '%(vlan_tag)d'!"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1239
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1302
 #, python-format
 msgid ""
 "Port %s was not found on the integration bridge and will therefore not be"
 " processed"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1272
-#, python-format
-msgid "Configuration for device %s completed."
-msgstr ""
-
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1291
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1343
 #, python-format
 msgid "Ancillary Port %s added"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1549
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1605
 msgid "Agent tunnel out of sync with plugin!"
 msgstr ""
 
diff --git a/neutron/locale/neutron-log-warning.pot b/neutron/locale/neutron-log-warning.pot
index 746936286..de38046a2 100644
--- a/neutron/locale/neutron-log-warning.pot
+++ b/neutron/locale/neutron-log-warning.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.2.0.dev268\n"
+"Project-Id-Version: neutron 2015.2.0.dev319\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-04 06:08+0000\n"
+"POT-Creation-Date: 2015-05-10 06:14+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"
@@ -29,7 +29,13 @@ msgstr ""
 msgid "Unable to find data type descriptor for attribute %s"
 msgstr ""
 
-#: neutron/quota.py:229
+#: neutron/quota.py:223
+msgid ""
+"The quota driver neutron.quota.ConfDriver is deprecated as of Liberty. "
+"neutron.db.quota_db.DbQuotaDriver should be used in its place"
+msgstr ""
+
+#: neutron/quota.py:237
 #, python-format
 msgid "%s is already registered."
 msgstr ""
@@ -43,11 +49,11 @@ msgid "Tunnel synchronization requires a server upgrade."
 msgstr ""
 
 #: neutron/agent/securitygroups_rpc.py:65
-#: neutron/agent/securitygroups_rpc.py:96
+#: neutron/agent/securitygroups_rpc.py:98
 msgid "Driver configuration doesn't match with enable_security_group"
 msgstr ""
 
-#: neutron/agent/securitygroups_rpc.py:123
+#: neutron/agent/securitygroups_rpc.py:142
 msgid ""
 "security_group_info_for_devices rpc call not supported by the server, "
 "falling back to old security_group_rules_for_devices which scales worse."
@@ -146,7 +152,7 @@ msgid ""
 "%(top)r"
 msgstr ""
 
-#: neutron/agent/linux/iptables_manager.py:688
+#: neutron/agent/linux/iptables_manager.py:689
 #, python-format
 msgid "Attempted to get traffic counters of chain %s which does not exist"
 msgstr ""
@@ -365,15 +371,15 @@ msgstr ""
 msgid "Invalid Segmentation ID: %s, will lead to incorrect vxlan device name"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:518
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:554
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:526
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:562
 #, python-format
 msgid ""
 "Option \"%(option)s\" must be supported by command \"%(command)s\" to "
 "enable %(mode)s mode"
 msgstr ""
 
-#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:548
+#: neutron/plugins/linuxbridge/agent/linuxbridge_neutron_agent.py:556
 msgid ""
 "VXLAN muticast group must be provided in vxlan_group option to enable "
 "VXLAN MCAST mode"
@@ -517,38 +523,38 @@ msgid ""
 "message: %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:496
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:516
 #, python-format
 msgid "Action %s not supported"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:954
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1013
 #, python-format
 msgid ""
 "Creating an interface named %(name)s exceeds the %(limit)d character "
 "limitation. It was shortened to %(new_name)s to fit."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1154
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1214
 #, python-format
 msgid "VIF port: %s has no ofport configured, and might not be able to transmit"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1274
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1326
 #, python-format
 msgid "Device %s not defined on plugin"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1429
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1484
 #, python-format
 msgid "Invalid remote IP: %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1472
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1527
 msgid "OVS is restarted. OVSNeutronAgent will reset bridges and recover ports."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1476
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1531
 msgid ""
 "OVS is dead. OVSNeutronAgent will keep running and checking OVS status "
 "periodically."
diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index ec0e59751..23bf2df19 100644
--- a/neutron/locale/neutron.pot
+++ b/neutron/locale/neutron.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.2.0.dev268\n"
+"Project-Id-Version: neutron 2015.2.0.dev319\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-04 06:08+0000\n"
+"POT-Creation-Date: 2015-05-10 06:14+0000\n"
 "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
@@ -59,33 +59,33 @@ msgid ""
 "found"
 msgstr ""
 
-#: neutron/quota.py:35
+#: neutron/quota.py:37
 msgid "Resource name(s) that are supported in quota features"
 msgstr ""
 
-#: neutron/quota.py:39
+#: neutron/quota.py:41
 msgid ""
 "Default number of resource allowed per tenant. A negative value means "
 "unlimited."
 msgstr ""
 
-#: neutron/quota.py:43
+#: neutron/quota.py:45
 msgid "Number of networks allowed per tenant. A negative value means unlimited."
 msgstr ""
 
-#: neutron/quota.py:47
+#: neutron/quota.py:49
 msgid "Number of subnets allowed per tenant, A negative value means unlimited."
 msgstr ""
 
-#: neutron/quota.py:51
+#: neutron/quota.py:53
 msgid "Number of ports allowed per tenant. A negative value means unlimited."
 msgstr ""
 
-#: neutron/quota.py:55
+#: neutron/quota.py:57
 msgid "Default driver to use for quota checks"
 msgstr ""
 
-#: neutron/quota.py:134 neutron/quota.py:139
+#: neutron/quota.py:136 neutron/quota.py:141
 msgid "Access to this resource was denied."
 msgstr ""
 
@@ -912,7 +912,7 @@ msgstr ""
 msgid "'%s' is not a valid boolean value"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:143 neutron/api/v2/attributes.py:522
+#: neutron/api/v2/attributes.py:143 neutron/api/v2/attributes.py:473
 #, python-format
 msgid "'%s' is not an integer"
 msgstr ""
@@ -957,128 +957,92 @@ msgstr ""
 msgid "Duplicate IP address '%s'"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:269
-#, python-format
-msgid "%(host)s is not a valid IP or hostname. Details: %(ip_err)s, %(name_err)s"
-msgstr ""
-
-#: neutron/api/v2/attributes.py:278
+#: neutron/api/v2/attributes.py:264
 #, python-format
 msgid "Invalid data format for nameserver: '%s'"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:287
+#: neutron/api/v2/attributes.py:273
 #, python-format
 msgid "'%(host)s' is not a valid nameserver. %(msg)s"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:292
+#: neutron/api/v2/attributes.py:278
 #, python-format
 msgid "Duplicate nameserver '%s'"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:300
+#: neutron/api/v2/attributes.py:286
 #, python-format
 msgid "Invalid data format for hostroute: '%s'"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:317
+#: neutron/api/v2/attributes.py:303
 #, python-format
 msgid "Duplicate hostroute '%s'"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:334
+#: neutron/api/v2/attributes.py:320
+#: neutron/tests/unit/api/v2/test_attributes.py:501
 #: neutron/tests/unit/api/v2/test_attributes.py:515
-#: neutron/tests/unit/api/v2/test_attributes.py:529
-#: neutron/tests/unit/api/v2/test_attributes.py:537
+#: neutron/tests/unit/api/v2/test_attributes.py:523
 #, python-format
 msgid "'%(data)s' isn't a recognized IP subnet cidr, '%(cidr)s' is recommended"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:340
+#: neutron/api/v2/attributes.py:326
 #, python-format
 msgid "'%s' is not a valid IP subnet"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:348 neutron/api/v2/attributes.py:436
+#: neutron/api/v2/attributes.py:334 neutron/api/v2/attributes.py:387
 #, python-format
 msgid "'%s' is not a list"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:353 neutron/api/v2/attributes.py:446
+#: neutron/api/v2/attributes.py:339 neutron/api/v2/attributes.py:397
 #, python-format
 msgid "Duplicate items in the list: '%s'"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:381
-#, python-format
-msgid "'%s' exceeds the 255 character hostname limit"
-msgstr ""
-
-#: neutron/api/v2/attributes.py:385
-msgid "Encountered an empty component."
-msgstr ""
-
-#: neutron/api/v2/attributes.py:388
-#, python-format
-msgid "Name '%s' must not start or end with a hyphen."
-msgstr ""
-
-#: neutron/api/v2/attributes.py:391
-#, python-format
-msgid ""
-"Name '%s' must be 1-63 characters long, each of which can only be "
-"alphanumeric or a hyphen."
-msgstr ""
-
-#: neutron/api/v2/attributes.py:396
-#, python-format
-msgid "TLD '%s' must not be all numeric"
-msgstr ""
-
-#: neutron/api/v2/attributes.py:398
-#, python-format
-msgid "'%(data)s' is not a valid hostname. Reason: %(reason)s"
-msgstr ""
-
-#: neutron/api/v2/attributes.py:411
+#: neutron/api/v2/attributes.py:362
 #, python-format
 msgid "'%s' is not a valid input"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:424
+#: neutron/api/v2/attributes.py:375
 #: neutron/plugins/cisco/n1kv/n1kv_neutron_plugin.py:532
 #, python-format
 msgid "'%s' is not a valid UUID"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:466
+#: neutron/api/v2/attributes.py:417
 #, python-format
 msgid "Validator '%s' does not exist."
 msgstr ""
 
-#: neutron/api/v2/attributes.py:478
+#: neutron/api/v2/attributes.py:429
 #, python-format
 msgid "'%s' is not a dictionary"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:527
+#: neutron/api/v2/attributes.py:478
 #, python-format
 msgid "'%s' should be non-negative"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:546
+#: neutron/api/v2/attributes.py:497
 #, python-format
 msgid "'%s' cannot be converted to boolean"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:559
+#: neutron/api/v2/attributes.py:510
 #: neutron/plugins/nec/extensions/packetfilter.py:72
 #, python-format
 msgid "'%s' is not a integer"
 msgstr ""
 
-#: neutron/api/v2/attributes.py:578
+#: neutron/api/v2/attributes.py:529
 #, python-format
 msgid "'%s' is not of the form <key>=[value]"
 msgstr ""
@@ -2023,36 +1987,36 @@ msgstr ""
 msgid "ipv6_address_mode is not valid when ip_version is 4"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1264
+#: neutron/db/db_base_plugin_v2.py:1277
 msgid "allocation_pools allowed only for specific subnet requests."
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1275
+#: neutron/db/db_base_plugin_v2.py:1288
 #, python-format
 msgid "Cannot allocate IPv%(req_ver)s subnet from IPv%(pool_ver)s subnet pool"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1353
+#: neutron/db/db_base_plugin_v2.py:1366
 msgid "ip_version must be specified in the absence of cidr and subnetpool_id"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1370
+#: neutron/db/db_base_plugin_v2.py:1383
 msgid "cidr and prefixlen must not be supplied together"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1381
+#: neutron/db/db_base_plugin_v2.py:1394
 msgid "A cidr must be specified in the absence of a subnet pool"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1681
+#: neutron/db/db_base_plugin_v2.py:1694
 msgid "Existing prefixes must be a subset of the new prefixes"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1748
+#: neutron/db/db_base_plugin_v2.py:1761
 msgid "Subnet pool has existing allocations"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1755
+#: neutron/db/db_base_plugin_v2.py:1768
 msgid "mac address update"
 msgstr ""
 
@@ -2204,6 +2168,12 @@ msgstr ""
 msgid "Unable to create the SNAT Interface Port"
 msgstr ""
 
+#: neutron/db/l3_gwmode_db.py:29
+msgid ""
+"Define the default value of enable_snat if not provided in "
+"external_gateway_info."
+msgstr ""
+
 #: neutron/db/l3_hamode_db.py:43
 msgid "Enable HA mode for virtual routers."
 msgstr ""
@@ -4663,23 +4633,23 @@ msgid ""
 "error: %(error)s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1657
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1712
 msgid ""
 "DVR deployments for VXLAN/GRE underlays require L2-pop to be enabled, in "
 "both the Agent and Server side."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1675
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1730
 #, python-format
 msgid "Parsing bridge_mappings failed: %s."
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1697
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1752
 #, python-format
 msgid "Invalid tunnel type specified: %s"
 msgstr ""
 
-#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1700
+#: neutron/plugins/openvswitch/agent/ovs_neutron_agent.py:1755
 msgid "Tunneling cannot be enabled without a valid local_ip."
 msgstr ""
 
@@ -5084,8 +5054,8 @@ msgstr ""
 msgid "Keepalived didn't respawn"
 msgstr ""
 
-#: neutron/tests/unit/agent/linux/test_iptables_manager.py:839
-#: neutron/tests/unit/agent/linux/test_iptables_manager.py:873
+#: neutron/tests/unit/agent/linux/test_iptables_manager.py:845
+#: neutron/tests/unit/agent/linux/test_iptables_manager.py:879
 #, python-format
 msgid ""
 "IPTablesManager.apply failed to apply the following set of iptables "
@@ -5141,8 +5111,8 @@ msgstr ""
 msgid "Adds test attributes to core resources."
 msgstr ""
 
-#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:962
-#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:979
+#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:955
+#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:972
 #, python-format
 msgid "Failed to set-up %(type)s tunnel port to %(ip)s"
 msgstr ""
diff --git a/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po b/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
index 8a47248fe..629497919 100644
--- a/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-05-04 06:08+0000\n"
+"POT-Creation-Date: 2015-05-10 06:14+0000\n"
 "PO-Revision-Date: 2015-04-28 07:50+0000\n"
 "Last-Translator: 汪军 <wwyyzz08@sina.com>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/neutron/"
@@ -433,14 +433,14 @@ msgstr "对于网络标识 %(net_uuid)s，正在将 %(vlan_id)s 分配为本地
 msgid "Reclaiming vlan = %(vlan_id)s from net-id = %(net_uuid)s"
 msgstr "正在从网络标识 %(net_uuid)s 恢复 vlan %(vlan_id)s"
 
-#, python-format
-msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
-msgstr "正在将物理网络 %(physical_network)s 映射至网桥 %(bridge)s"
-
 #, python-format
 msgid "Configuration for device %s completed."
 msgstr "设备 %s 的配置已完成。"
 
+#, python-format
+msgid "Mapping physical network %(physical_network)s to bridge %(bridge)s"
+msgstr "正在将物理网络 %(physical_network)s 映射至网桥 %(bridge)s"
+
 msgid "Agent tunnel out of sync with plugin!"
 msgstr "代理隧道与插件不同步！"