Imported Translations from Transifex

Change-Id: I8df971702d0709ed90db12b3f1ffff75b4931c5a

diff --git a/quantum/locale/bg_BG/LC_MESSAGES/quantum.po b/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
index 10ce5d4cee7b2362934282c8f6809c5851c83be5..3564841e133e6f212ae788df74fb894bf049f64e 100644 (file)
--- a/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
+++ b/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Bulgarian (Bulgaria) "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/cs/LC_MESSAGES/quantum.po b/quantum/locale/cs/LC_MESSAGES/quantum.po
index cb25e8b7654cf84e23ed04f5a5661828d1f3554f..b22a0d88d587376bffa4c26c20f8eb8ec19f0903 100644 (file)
--- a/quantum/locale/cs/LC_MESSAGES/quantum.po
+++ b/quantum/locale/cs/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/da/LC_MESSAGES/quantum.po b/quantum/locale/da/LC_MESSAGES/quantum.po
index d14f0f4b39774eb72e4c66d6f045ee2767b65b73..61d6ccd8adacf5eed8e7c38b199819e4fcefb063 100644 (file)
--- a/quantum/locale/da/LC_MESSAGES/quantum.po
+++ b/quantum/locale/da/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/de/LC_MESSAGES/quantum.po b/quantum/locale/de/LC_MESSAGES/quantum.po
index 9813b68e6a81243d2a57b395b6117d035bf2d637..7c7fe659764fed7d389462a0fb92c62a847092a1 100644 (file)
--- a/quantum/locale/de/LC_MESSAGES/quantum.po
+++ b/quantum/locale/de/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-05-22 08:17+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: German "
@@ -1900,32 +1900,32 @@ msgstr "Gateway-IP '%(ip_address)s' steht im Konflikt mit Zuordnungspool %(pool)
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr "Im Cache gespeicherte Datei %s wird neu geladen"
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr "Ungültige Zuordnung: '%s'"
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr "Fehlender Schlüssel in Zuordnung: '%s'"
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr "Fehlender Wert in Zuordnung: '%s'"
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr "Schlüssel %(key)s in Zuordnung: '%(mapping)s' nicht eindeutig"
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr "Wert %(value)s in Zuordnung: '%(mapping)s' nicht eindeutig"
@@ -1990,18 +1990,26 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 "Es wurde festgestellt, dass keine Verbindung zum mysql-Server mehr "
 "vorhanden ist: %s"
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr "Datenbankserver nicht mehr verbunden"
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
@@ -2010,17 +2018,17 @@ msgstr ""
 "Die Option 'sql_connection' ist in keiner Konfigurationsdatei angegeben -"
 " der Standardwert '%s' wird verwendet"
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 "Eventlet-Verbindungspooling wird ohne 'python-mysqldb' nicht "
 "funktionieren!"
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr "Datenbankverbindung verloren, beenden..."
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
@@ -2030,7 +2038,7 @@ msgstr ""
 "verbleibende Versuche. Erneuter Versuch in %(reconnect_interval)s "
 "Sekunden"
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "Datenbankregistrierungsausnahme: %s"
@@ -3773,7 +3781,7 @@ msgstr "Keine schlüsseldefinierenden Hosts für Topic '%s', siehe Ringdatei"
 msgid "Creating Consumer connection for Service %s"
 msgstr "Erstellung von Consumerverbindung für Service %s"
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3782,23 +3790,23 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr "Daten beim Herstellen der Verbindung synchronisieren"
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
@@ -3806,11 +3814,11 @@ msgstr ""
 "Maximale Anzahl an Sekunden, die darauf gewartet werden soll, dass eine "
 "Proxy-Anforderung verbunden und abgeschlossen wird."
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr "Benutzer hat die ID für diese Quantum-Implementierung definiert"
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
@@ -3818,15 +3826,15 @@ msgstr ""
 "Durch Markierung festlegen, ob eine Route zum Metadatenserver in der VM "
 "injiziert werden soll"
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr "Fehler bei REST-Aufruf an Controller von fernem Netz"
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
@@ -3835,25 +3843,25 @@ msgstr ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr "ServerProxy: HTTPS-Verbindung konnte nicht hergestellt werden"
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr "ServerProxy: HTTP-Verbindung konnte nicht hergestellt werden"
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr "ServerProxy: %(action)s fehlgeschlagen, %(e)r"
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
@@ -3862,168 +3870,168 @@ msgstr ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr "Server-Proxy: Fehler bei %(action)s für Server: %(server)r"
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr "ServerProxy: Fehler bei %(action)s für alle Server: %(server)r"
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr "QuantumRestProxy: Starten von Plug-in. Version=%s"
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr "QuantumRestProxyV2: Initialisierung abgeschlossen"
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'create_network()'"
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr "QuantumRestProxyV2: Erstellung von fernem Netz nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr "Aufruf von 'QuantumRestProxyV2.update_network()'"
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr "QuantumRestProxyV2: Aktualisierung von fernem Netz nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'delete_network()'"
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'create_port()'"
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr "QuantumRestProxyV2: Erstellung von fernem Port nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'update_port()'"
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'delete_port()'"
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr "QuantumRestProxyV2: Aktualisierung von fernem Port nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr "QuantumRestProxyV2: Aufruf von '_plug_interface()'"
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr "QuantumRestProxyV2: Aktualisierung von fernem Netz nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr "QuantumRestProxyV2: Aufruf von '_unplug_interface()'"
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'create_subnet()'"
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'update_subnet()'"
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'delete_subnet()'"
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'create_router()'"
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr "QuantumRestProxyV2: Erstellung von fernem Router nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr "Aufruf von 'QuantumRestProxyV2.update_router()'"
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr "QuantumRestProxyV2: Aktualisierung von fernem Router nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'delete_router()'"
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr "QuantumRestProxyV2: Löschen von fernem Router nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'add_router_interface()'"
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr "QuantumRestProxyV2: Erstellung von Schnittstelle nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'remove_router_interface()'"
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr "QuantumRestProxyV2: Löschen von ferner Schnittstelle nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'create_floatingip()'"
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 "QuantumRestProxyV2: Erstellung von ferner dynamischer IP-Adresse nicht "
 "möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'update_floatingip()'"
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr "QuantumRestProxyV2: Aufruf von 'delete_floatingip()'"
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr "QuantumRestProxy: Aktualisierung von ferner Topologie nicht möglich: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
@@ -4032,7 +4040,7 @@ msgstr ""
 "In dieser Plug-in-Version wird das Einstellen von 'admin_state_up=False' "
 "nicht unterstützt. Einstellungen werden ignoriert für Ressource: %s"
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
@@ -4041,7 +4049,7 @@ msgstr ""
 "Der Betriebsstatus wird intern vom Plug-in eingestellt. Die Einstellung "
 "'status=%s' wird ignoriert."
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""

diff --git a/quantum/locale/es/LC_MESSAGES/quantum.po b/quantum/locale/es/LC_MESSAGES/quantum.po
index 0b1df2e9e7eb94266ffd8f8d4eebb8106c388319..dec5aca6d9565f21d7627d2718fc1dbd8597f5b9 100644 (file)
--- a/quantum/locale/es/LC_MESSAGES/quantum.po
+++ b/quantum/locale/es/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/fi_FI/LC_MESSAGES/quantum.po b/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
index 5d85cb7f2360c2f019a7ed301f3d405825a8d25e..4bcf4b0faff4f6e9d1666952c1adeed983f53ac1 100644 (file)
--- a/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
+++ b/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Finnish (Finland) "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/fr/LC_MESSAGES/quantum.po b/quantum/locale/fr/LC_MESSAGES/quantum.po
index 9fe589119cd0693fb1887fcb0c5394fbf396fcf8..e057814f1fe6eafe9fdb73fac66a4beeaa6ef4b1 100644 (file)
--- a/quantum/locale/fr/LC_MESSAGES/quantum.po
+++ b/quantum/locale/fr/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/it/LC_MESSAGES/quantum.po b/quantum/locale/it/LC_MESSAGES/quantum.po
index bce575d4e0ebdcee19bd661c526673832d778822..5ebe17a0ea1182f45c7463da846b77f252f456f2 100644 (file)
--- a/quantum/locale/it/LC_MESSAGES/quantum.po
+++ b/quantum/locale/it/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/ja/LC_MESSAGES/quantum.po b/quantum/locale/ja/LC_MESSAGES/quantum.po
index ba4da65fce858c4bb08be8ae457ebf9c3a13235d..e563567bc24e61477e42f242720852d8d3e85257 100644 (file)
--- a/quantum/locale/ja/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ja/LC_MESSAGES/quantum.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-01-30 10:28+0000\n"
 "Last-Translator: Tomoyuki KATO <tomo@dream.daynight.jp>\n"
 "Language-Team: Japanese "
@@ -1784,32 +1784,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1866,38 +1866,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3488,7 +3496,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3497,252 +3505,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8402,9 +8410,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/ka_GE/LC_MESSAGES/quantum.po b/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
index 7b0900537c5b9fbd2a04b9e303c88ea5f814ead2..a6aef18a0530d4ddb586352fd366d699b331875d 100644 (file)
--- a/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-04-19 14:53+0000\n"
 "Last-Translator: Nika Chkhikvishvili <frrrredo@gmail.com>\n"
 "Language-Team: ka_GE <LL@li.org>\n"
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8402,9 +8410,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/ko_KR/LC_MESSAGES/quantum.po b/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
index 41f9939f0a5f6c0d20349ccbfc4a592bea901c14..13882c5782e1acdf4e01cd0ddec305becefb240c 100644 (file)
--- a/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-04-28 05:13+0000\n"
 "Last-Translator: ujuc Gang <potopro@gmail.com>\n"
 "Language-Team: ko_KR <LL@li.org>\n"
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/pt_BR/LC_MESSAGES/quantum.po b/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
index b95e0727e702133fd5d1f325e73c27ec5a29a2b3..f4520c358cc8cc8b799e52d4d1115dd5855195ea 100644 (file)
--- a/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
+++ b/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Portuguese (Brazil) "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/quantum.pot b/quantum/locale/quantum.pot
index 538433c78099a54465cf8f151e5483899b067ad0..d6fc6f1c9ee3180df2f318148f0d108636310b51 100644 (file)
--- a/quantum/locale/quantum.pot
+++ b/quantum/locale/quantum.pot
@@ -7,9 +7,9 @@
 msgid ""
 msgstr ""
 "Project-Id-Version: quantum "
-"jenkins.quantum.propose.translation.update.133\n"
+"jenkins.quantum.propose.translation.update.134\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+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"
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""

diff --git a/quantum/locale/ro/LC_MESSAGES/quantum.po b/quantum/locale/ro/LC_MESSAGES/quantum.po
index f91ee143bae28497fa91510b0fda9240b4534e83..02119d1916dd070c732d639cb53fdc964074df16 100644 (file)
--- a/quantum/locale/ro/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ro/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-06-08 07:51+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Romanian "
@@ -1784,32 +1784,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1866,38 +1866,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3488,7 +3496,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3497,252 +3505,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8402,9 +8410,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/ru/LC_MESSAGES/quantum.po b/quantum/locale/ru/LC_MESSAGES/quantum.po
index 6acb0cf9325a65c23c909e9ea922c8a0d395a858..d88ec14dc213e4c0725a8266514707bf09924509 100644 (file)
--- a/quantum/locale/ru/LC_MESSAGES/quantum.po
+++ b/quantum/locale/ru/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -1784,32 +1784,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1866,38 +1866,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3488,7 +3496,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3497,252 +3505,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8402,9 +8410,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/vi_VN/LC_MESSAGES/quantum.po b/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
index cf4bf15a49a2d1b4bdd12cb8d380d6d37e957741..157989ec37cfbced5aafc2b42f298ea162e820ea 100644 (file)
--- a/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
+++ b/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Vietnamese (Viet Nam) "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/zh_CN/LC_MESSAGES/quantum.po b/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
index 1128ea4e020e2e3a377dee0b088d274d45805e34..1ca7d6b4cbc17a5b275ab5ba1f9f467ebe9e6fc9 100644 (file)
--- a/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
+++ b/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) "
@@ -1783,32 +1783,32 @@ msgstr ""
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr ""
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
@@ -1865,38 +1865,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr ""
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr ""
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr ""
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr ""
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr ""
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr ""
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr ""
@@ -3487,7 +3495,7 @@ msgstr ""
 msgid "Creating Consumer connection for Service %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3496,252 +3504,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""
@@ -8401,9 +8409,3 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
-#~ msgid ""
-#~ "Security group rule protocol %(protocol)s "
-#~ "not supported. Only protocol values "
-#~ "%(values)s supported."
-#~ msgstr ""
-

diff --git a/quantum/locale/zh_TW/LC_MESSAGES/quantum.po b/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
index 2309931bd4d6f922f44e300c0eaa1bf280082da9..a4e14012216064e6ee3a6d77df12d3d4642a8264 100644 (file)
--- a/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
+++ b/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
@@ -7,7 +7,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version:  Quantum\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-10 12:11+0000\n"
+"POT-Creation-Date: 2013-06-11 12:11+0000\n"
 "PO-Revision-Date: 2013-05-22 03:25+0000\n"
 "Last-Translator: daisy.ycguo <daisy.ycguo@gmail.com>\n"
 "Language-Team: Chinese (Taiwan) "
@@ -1796,32 +1796,32 @@ msgstr "閘道 IP %(ip_address)s 與配置儲存區 %(pool)s 相衝突"
 msgid "Invalid network VLAN range: '%(vlan_range)s' - '%(error)s'"
 msgstr ""
 
-#: quantum/common/utils.py:52
+#: quantum/common/utils.py:55
 #, python-format
 msgid "Reloading cached file %s"
 msgstr "正在重新載入快取檔 %s"
 
-#: quantum/common/utils.py:135
+#: quantum/common/utils.py:138
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr "無效的對映：'%s'"
 
-#: quantum/common/utils.py:138
+#: quantum/common/utils.py:141
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr "對映中遺漏了索引鍵：'%s'"
 
-#: quantum/common/utils.py:141
+#: quantum/common/utils.py:144
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr "對映中遺漏了值：'%s'"
 
-#: quantum/common/utils.py:143
+#: quantum/common/utils.py:146
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr "對映 '%(mapping)s' 中的索引鍵 %(key)s 不是唯一的"
 
-#: quantum/common/utils.py:146
+#: quantum/common/utils.py:149
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr "對映 '%(mapping)s' 中的值 %(value)s 不是唯一的"
@@ -1878,38 +1878,46 @@ msgid ""
 "SQLAlchemy"
 msgstr ""
 
-#: quantum/db/api.py:91
+#: quantum/db/api.py:72
+msgid "If set, use this value for max_overflow with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:76
+msgid "If set, use this value for pool_timeout with sqlalchemy"
+msgstr ""
+
+#: quantum/db/api.py:99
 #, python-format
 msgid "Got mysql server has gone away: %s"
 msgstr "已取得 mysql 伺服器已斷線的訊息：%s"
 
-#: quantum/db/api.py:92
+#: quantum/db/api.py:100
 msgid "Database server went away"
 msgstr "資料庫伺服器已斷線"
 
-#: quantum/db/api.py:118
+#: quantum/db/api.py:126
 #, python-format
 msgid ""
 "Option 'sql_connection' not specified in any config file - using default "
 "value '%s'"
 msgstr "未在任何配置檔中指定選項 'sql_connection' - 正在使用預設值 '%s'"
 
-#: quantum/db/api.py:154
+#: quantum/db/api.py:171
 msgid "Eventlet connection pooling will not work without python-mysqldb!"
 msgstr "如果未指定 python-mysqldb，則 eventlet 連線儲存區將無法運作！"
 
-#: quantum/db/api.py:201
+#: quantum/db/api.py:218
 msgid "Database connection lost, exit..."
 msgstr "資料庫連線已中斷，結束..."
 
-#: quantum/db/api.py:204
+#: quantum/db/api.py:221
 #, python-format
 msgid ""
 "Unable to connect to database, %(remaining)s attempts left. Retrying in "
 "%(reconnect_interval)s seconds"
 msgstr "無法連接至資料庫，還可以嘗試 %(remaining)s 次。將在 %(reconnect_interval)s 秒鐘後重試"
 
-#: quantum/db/api.py:220
+#: quantum/db/api.py:237
 #, python-format
 msgid "Database registration exception: %s"
 msgstr "資料庫登錄異常狀況：%s"
@@ -3514,7 +3522,7 @@ msgstr "沒有索引鍵給主題 '%s' 定義主機，請參閱 ringfile"
 msgid "Creating Consumer connection for Service %s"
 msgstr "正在為服務 %s 建立消費者連線"
 
-#: quantum/plugins/bigswitch/plugin.py:79
+#: quantum/plugins/bigswitch/plugin.py:78
 msgid ""
 "A comma separated list of BigSwitch or Floodlight servers and port "
 "numbers. The plugin proxies the requests to the BigSwitch/Floodlight "
@@ -3523,252 +3531,252 @@ msgid ""
 "servers to support failover."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:86
+#: quantum/plugins/bigswitch/plugin.py:85
 msgid ""
 "The username and password for authenticating against  the BigSwitch or "
 "Floodlight controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:89
+#: quantum/plugins/bigswitch/plugin.py:88
 msgid ""
 "If True, Use SSL when connecting to the BigSwitch or Floodlight "
 "controller."
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:92
+#: quantum/plugins/bigswitch/plugin.py:91
 msgid "Sync data on connect"
 msgstr "在連接時同步資料"
 
-#: quantum/plugins/bigswitch/plugin.py:94
+#: quantum/plugins/bigswitch/plugin.py:93
 msgid ""
 "Maximum number of seconds to wait for proxy request to connect and "
 "complete."
 msgstr "等候 Proxy 要求連接並完成的秒數上限。"
 
-#: quantum/plugins/bigswitch/plugin.py:97
+#: quantum/plugins/bigswitch/plugin.py:96
 msgid "User defined identifier for this Quantum deployment"
 msgstr "此 Quantum 部署的使用者定義 ID"
 
-#: quantum/plugins/bigswitch/plugin.py:99
+#: quantum/plugins/bigswitch/plugin.py:98
 msgid ""
 "Flag to decide if a route to the metadata server should be injected into "
 "the VM"
 msgstr "用來決定是否應該將 meta 資料伺服器路徑注入 VM 的旗標"
 
-#: quantum/plugins/bigswitch/plugin.py:109
+#: quantum/plugins/bigswitch/plugin.py:108
 msgid "Virtual interface type to configure on Nova compute nodes"
 msgstr ""
 
-#: quantum/plugins/bigswitch/plugin.py:141
+#: quantum/plugins/bigswitch/plugin.py:140
 msgid "Error in REST call to remote network controller"
 msgstr "對遠端網路控制器進行 REST 呼叫時發生錯誤"
 
-#: quantum/plugins/bigswitch/plugin.py:177
+#: quantum/plugins/bigswitch/plugin.py:176
 #, python-format
 msgid ""
 "ServerProxy: server=%(server)s, port=%(port)d, ssl=%(ssl)r, "
 "action=%(action)s"
 msgstr "ServerProxy：伺服器 = %(server)s，埠 = %(port)d，SSL = %(ssl)r，操作 = %(action)s"
 
-#: quantum/plugins/bigswitch/plugin.py:181
+#: quantum/plugins/bigswitch/plugin.py:180
 #, python-format
 msgid "ServerProxy: resource=%(resource)s, data=%(data)r, headers=%(headers)r"
 msgstr "ServerProxy：資源 = %(resource)s，資料 = %(data)r，標頭 = %(headers)r"
 
-#: quantum/plugins/bigswitch/plugin.py:190
+#: quantum/plugins/bigswitch/plugin.py:189
 msgid "ServerProxy: Could not establish HTTPS connection"
 msgstr "ServerProxy：無法建立 HTTPS 連線"
 
-#: quantum/plugins/bigswitch/plugin.py:197
+#: quantum/plugins/bigswitch/plugin.py:196
 msgid "ServerProxy: Could not establish HTTP connection"
 msgstr "ServerProxy：無法建立 HTTP 連線"
 
-#: quantum/plugins/bigswitch/plugin.py:214
+#: quantum/plugins/bigswitch/plugin.py:213
 #, python-format
 msgid "ServerProxy: %(action)s failure, %(e)r"
 msgstr "ServerProxy：%(action)s 失敗，%(e)r"
 
-#: quantum/plugins/bigswitch/plugin.py:218
+#: quantum/plugins/bigswitch/plugin.py:217
 #, python-format
 msgid ""
 "ServerProxy: status=%(status)d, reason=%(reason)r, ret=%(ret)s, "
 "data=%(data)r"
 msgstr "ServerProxy：狀態 = %(status)d，原因 = %(reason)r，ret = %(ret)s，資料 = %(data)r"
 
-#: quantum/plugins/bigswitch/plugin.py:268
+#: quantum/plugins/bigswitch/plugin.py:267
 #, python-format
 msgid "ServerProxy: %(action)s failure for servers: %(server)r"
 msgstr "ServerProxy：對伺服器 %(server)r 執行的 %(action)s 失敗"
 
-#: quantum/plugins/bigswitch/plugin.py:276
+#: quantum/plugins/bigswitch/plugin.py:275
 #, python-format
 msgid "ServerProxy: %(action)s failure for all servers: %(server)r"
 msgstr "ServerProxy：對所有伺服器 %(server)r 執行的 %(action)s 失敗"
 
-#: quantum/plugins/bigswitch/plugin.py:311
+#: quantum/plugins/bigswitch/plugin.py:310
 #, python-format
 msgid "QuantumRestProxy: Starting plugin. Version=%s"
 msgstr "QuantumRestProxy：正在啟動外掛程式。版本 = %s"
 
-#: quantum/plugins/bigswitch/plugin.py:351
+#: quantum/plugins/bigswitch/plugin.py:350
 msgid "QuantumRestProxyV2: initialization done"
 msgstr "QuantumRestProxyV2：已完成起始設定"
 
-#: quantum/plugins/bigswitch/plugin.py:377
+#: quantum/plugins/bigswitch/plugin.py:376
 msgid "QuantumRestProxyV2: create_network() called"
 msgstr "QuantumRestProxyV2：已呼叫 create_network()"
 
-#: quantum/plugins/bigswitch/plugin.py:403
+#: quantum/plugins/bigswitch/plugin.py:402
 #, python-format
 msgid "QuantumRestProxyV2:Unable to create remote network: %s"
 msgstr "QuantumRestProxyV2：無法建立遠端網路：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:435
+#: quantum/plugins/bigswitch/plugin.py:434
 msgid "QuantumRestProxyV2.update_network() called"
 msgstr "已呼叫 QuantumRestProxyV2.update_network()"
 
-#: quantum/plugins/bigswitch/plugin.py:453
-#: quantum/plugins/bigswitch/plugin.py:501
-#: quantum/plugins/bigswitch/plugin.py:1233
+#: quantum/plugins/bigswitch/plugin.py:452
+#: quantum/plugins/bigswitch/plugin.py:500
+#: quantum/plugins/bigswitch/plugin.py:1232
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote network: %s"
 msgstr "QuantumRestProxyV2：無法更新遠端網路：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:474
+#: quantum/plugins/bigswitch/plugin.py:473
 msgid "QuantumRestProxyV2: delete_network() called"
 msgstr "QuantumRestProxyV2：已呼叫 delete_network()"
 
-#: quantum/plugins/bigswitch/plugin.py:552
+#: quantum/plugins/bigswitch/plugin.py:551
 msgid "QuantumRestProxyV2: create_port() called"
 msgstr "QuantumRestProxyV2：已呼叫 create_port()"
 
-#: quantum/plugins/bigswitch/plugin.py:583
-#: quantum/plugins/bigswitch/plugin.py:671
+#: quantum/plugins/bigswitch/plugin.py:582
+#: quantum/plugins/bigswitch/plugin.py:670
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote port: %s"
 msgstr "QuantumRestProxyV2：無法建立遠端埠：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:638
+#: quantum/plugins/bigswitch/plugin.py:637
 msgid "QuantumRestProxyV2: update_port() called"
 msgstr "QuantumRestProxyV2：已呼叫 update_port()"
 
-#: quantum/plugins/bigswitch/plugin.py:692
+#: quantum/plugins/bigswitch/plugin.py:691
 msgid "QuantumRestProxyV2: delete_port() called"
 msgstr "QuantumRestProxyV2：已呼叫 delete_port()"
 
-#: quantum/plugins/bigswitch/plugin.py:721
-#: quantum/plugins/bigswitch/plugin.py:779
+#: quantum/plugins/bigswitch/plugin.py:720
+#: quantum/plugins/bigswitch/plugin.py:778
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote port: %s"
 msgstr "QuantumRestProxyV2：無法更新遠端埠：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:738
+#: quantum/plugins/bigswitch/plugin.py:737
 msgid "QuantumRestProxyV2: _plug_interface() called"
 msgstr "QuantumRestProxyV2：已呼叫 _plug_interface()"
 
-#: quantum/plugins/bigswitch/plugin.py:756
+#: quantum/plugins/bigswitch/plugin.py:755
 #, python-format
 msgid "QuantumRestProxyV2:Unable to update remote network: %s"
 msgstr "QuantumRestProxyV2：無法更新遠端網路：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:770
+#: quantum/plugins/bigswitch/plugin.py:769
 msgid "QuantumRestProxyV2: _unplug_interface() called"
 msgstr "QuantumRestProxyV2：已呼叫 _unplug_interface()"
 
-#: quantum/plugins/bigswitch/plugin.py:783
+#: quantum/plugins/bigswitch/plugin.py:782
 msgid "QuantumRestProxyV2: create_subnet() called"
 msgstr "QuantumRestProxyV2：已呼叫 create_subnet()"
 
-#: quantum/plugins/bigswitch/plugin.py:804
+#: quantum/plugins/bigswitch/plugin.py:803
 msgid "QuantumRestProxyV2: update_subnet() called"
 msgstr "QuantumRestProxyV2：已呼叫 update_subnet()"
 
-#: quantum/plugins/bigswitch/plugin.py:827
+#: quantum/plugins/bigswitch/plugin.py:826
 msgid "QuantumRestProxyV2: delete_subnet() called"
 msgstr "QuantumRestProxyV2：已呼叫 delete_subnet()"
 
-#: quantum/plugins/bigswitch/plugin.py:842
+#: quantum/plugins/bigswitch/plugin.py:841
 msgid "QuantumRestProxyV2: create_router() called"
 msgstr "QuantumRestProxyV2：已呼叫 create_router()"
 
-#: quantum/plugins/bigswitch/plugin.py:863
+#: quantum/plugins/bigswitch/plugin.py:862
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote router: %s"
 msgstr "QuantumRestProxyV2：無法建立遠端路由器：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:874
+#: quantum/plugins/bigswitch/plugin.py:873
 msgid "QuantumRestProxyV2.update_router() called"
 msgstr "已呼叫 QuantumRestProxyV2.update_router()"
 
-#: quantum/plugins/bigswitch/plugin.py:896
+#: quantum/plugins/bigswitch/plugin.py:895
 #, python-format
 msgid "QuantumRestProxyV2: Unable to update remote router: %s"
 msgstr "QuantumRestProxyV2：無法更新遠端路由器：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:908
+#: quantum/plugins/bigswitch/plugin.py:907
 msgid "QuantumRestProxyV2: delete_router() called"
 msgstr "QuantumRestProxyV2：已呼叫 delete_router()"
 
-#: quantum/plugins/bigswitch/plugin.py:939
+#: quantum/plugins/bigswitch/plugin.py:938
 #, python-format
 msgid "QuantumRestProxyV2: Unable to delete remote router: %s"
 msgstr "QuantumRestProxyV2：無法刪除遠端路由器：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:945
+#: quantum/plugins/bigswitch/plugin.py:944
 msgid "QuantumRestProxyV2: add_router_interface() called"
 msgstr "QuantumRestProxyV2：已呼叫 add_router_interface()"
 
-#: quantum/plugins/bigswitch/plugin.py:973
+#: quantum/plugins/bigswitch/plugin.py:972
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create interface: %s"
 msgstr "QuantumRestProxyV2：無法建立介面：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:984
+#: quantum/plugins/bigswitch/plugin.py:983
 msgid "QuantumRestProxyV2: remove_router_interface() called"
 msgstr "QuantumRestProxyV2：已呼叫 remove_router_interface()"
 
-#: quantum/plugins/bigswitch/plugin.py:1017
+#: quantum/plugins/bigswitch/plugin.py:1016
 #, python-format
 msgid "QuantumRestProxyV2:Unable to delete remote intf: %s"
 msgstr "QuantumRestProxyV2：無法刪除遠端介面：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:1025
+#: quantum/plugins/bigswitch/plugin.py:1024
 msgid "QuantumRestProxyV2: create_floatingip() called"
 msgstr "QuantumRestProxyV2：已呼叫 create_floatingip()"
 
-#: quantum/plugins/bigswitch/plugin.py:1038
+#: quantum/plugins/bigswitch/plugin.py:1037
 #, python-format
 msgid "QuantumRestProxyV2: Unable to create remote floatin IP: %s"
 msgstr "QuantumRestProxyV2：無法建立遠端浮動 IP：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:1048
+#: quantum/plugins/bigswitch/plugin.py:1047
 msgid "QuantumRestProxyV2: update_floatingip() called"
 msgstr "QuantumRestProxyV2：已呼叫 update_floatingip()"
 
-#: quantum/plugins/bigswitch/plugin.py:1071
+#: quantum/plugins/bigswitch/plugin.py:1070
 msgid "QuantumRestProxyV2: delete_floatingip() called"
 msgstr "QuantumRestProxyV2：已呼叫 delete_floatingip()"
 
-#: quantum/plugins/bigswitch/plugin.py:1154
+#: quantum/plugins/bigswitch/plugin.py:1153
 #, python-format
 msgid "QuantumRestProxy: Unable to update remote topology: %s"
 msgstr "QuantumRestProxy：無法更新遠端拓蹼：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:1250
+#: quantum/plugins/bigswitch/plugin.py:1249
 #, python-format
 msgid ""
 "Setting admin_state_up=False is not supported in this plugin version. "
 "Ignoring setting for resource: %s"
 msgstr "此外掛程式版本不支援設定 admin_state_up = False。正在忽略對資源的設定：%s"
 
-#: quantum/plugins/bigswitch/plugin.py:1256
+#: quantum/plugins/bigswitch/plugin.py:1255
 #, python-format
 msgid ""
 "Operational status is internally set by the plugin. Ignoring setting "
 "status=%s."
 msgstr "作業狀態是由外掛程式在內部設定。正在忽略設定狀態 = %s。"
 
-#: quantum/plugins/bigswitch/plugin.py:1283
+#: quantum/plugins/bigswitch/plugin.py:1282
 #, python-format
 msgid "Unrecognized vif_type in configuration [%s]. Defaulting to ovs. "
 msgstr ""