Imported Translations from Transifex

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

Change-Id: I700d3463e560d09e61f9d709b60f64b91feaa735

diff --git a/neutron/locale/de/LC_MESSAGES/neutron-log-info.po b/neutron/locale/de/LC_MESSAGES/neutron-log-info.po
index 6d5751a581d2e5c477349b0332a2341975792f48..0a805daa7c325d6ec5a13e09b820388f69ffd9e6 100644 (file)
--- a/neutron/locale/de/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/de/LC_MESSAGES/neutron-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
-"PO-Revision-Date: 2015-04-09 01:22+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+0000\n"
+"PO-Revision-Date: 2015-04-10 13:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: German (http://www.transifex.com/projects/p/neutron/language/"
 "de/)\n"
@@ -141,7 +141,7 @@ msgstr "Synchronisation von Status"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -151,12 +151,12 @@ msgstr "'agent_updated' (Agent aktualisiert) durch Serverseite %s!"
 msgid "L3 agent started"
 msgstr "Agent der Ebene 3 gestartet"
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted concurrently."
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -293,35 +293,37 @@ msgstr ""
 "Überprüfung für CIDR: %(new_cidr)s fehlgeschlagen - Überschneidung mit "
 "Teilnetz %(subnet_id)s (CIDR: %(cidr)s)"
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "Ungültige IP-Adresse in Pool gefunden: %(start)s - %(end)s:"
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 "Angegebene IP-Adressen stimmen nicht mit der Teilnetz-IP-Version überein"
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 "Anfangs-IP-Adresse (%(start)s) ist größer als Ende-IP-Adresse (%(end)s)"
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "Pool gefunden, der größer ist als Teilnetz-CIDR:%(start)s - %(end)s"
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "Überschneidungen bei Bereichen gefunden: %(l_range)s und %(r_range)s"
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet %(subnet)s, "
+"cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -351,7 +353,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr ""
 
@@ -409,50 +411,50 @@ msgstr "Überspringe periodische Aufgabe %(task)s weil sie deaktiviert ist"
 msgid "Caught %s, exiting"
 msgstr "%s abgefangen. Vorgang wird beendet"
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 "Übergeordneter Prozess wurde unerwartet abgebrochen. Vorgang wird beendet"
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "Untergeordnetes Element %s abgefangen; Vorgang wird beendet"
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr "Verzweigung zu schnell; im Ruhemodus"
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr "Untergeordnetes Element %d gestartet"
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr "Starten von %d Workers"
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Untergeordnetes Element %(pid)d durch Signal %(sig)d abgebrochen"
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Untergeordnete %(pid)s mit Status %(code)d beendet"
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "%s abgefangen, untergeordnete Elemente werden gestoppt"
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr ""
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Warten auf Beenden von %d untergeordneten Elementen"
@@ -734,7 +736,7 @@ msgstr ""
 msgid "Subnet %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted already."
@@ -762,12 +764,12 @@ msgstr ""
 msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "Bereiche für Netz-VLAN: %s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 

diff --git a/neutron/locale/es/LC_MESSAGES/neutron-log-info.po b/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
index 6dbd7ff347e7896fb787631f6abf53b4bc07bcb6..ac615850504c577b9ed7c1c5979c6f525448810a 100644 (file)
--- a/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/es/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
-"PO-Revision-Date: 2015-04-09 01:22+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+0000\n"
+"PO-Revision-Date: 2015-04-10 13:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish (http://www.transifex.com/projects/p/neutron/language/"
 "es/)\n"
@@ -140,7 +140,7 @@ msgstr "Sincronizando estado"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -150,12 +150,12 @@ msgstr "agent_updated por el lado del servidor %s!"
 msgid "L3 agent started"
 msgstr "Se ha iniciado al agente L3"
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted concurrently."
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -293,39 +293,41 @@ msgstr ""
 "Se ha encontrado un error en validación para CIDR: %(new_cidr)s; se solapa "
 "con la subred %(subnet_id)s (CIDR: %(cidr)s)"
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 "Se ha encontrado una dirección IP no válida en la agrupación: %(start)s - "
 "%(end)s:"
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 "Las direcciones IP especificadas no coinciden con la versión de IP de subred "
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 "La IP de inicio (%(start)s) es mayor que la IP de finalización (%(end)s)"
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 "Se ha encontrado una agrupación mayor que el CIDR de subred: %(start)s - "
 "%(end)s"
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "Rangos de solapamiento encontrados: %(l_range)s y %(r_range)s"
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet %(subnet)s, "
+"cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -354,7 +356,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr ""
 
@@ -411,49 +413,49 @@ msgstr "Omitiendo la tarea periódica %(task)s porque está inhabilitada"
 msgid "Caught %s, exiting"
 msgstr "Se ha captado %s, saliendo"
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "El proceso padre se ha detenido inesperadamente, saliendo"
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "Hijo captado %s, saliendo"
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr "Bifurcación demasiado rápida, en reposo"
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr "Se ha iniciado el hijo %d"
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr "Iniciando %d trabajadores"
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Hijo %(pid)d matado por señal %(sig)d"
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "El hijo %(pid)s ha salido con el estado %(code)d"
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "Se ha captado %s, deteniendo hijos"
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr ""
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "En espera de %d hijos para salir"
@@ -736,7 +738,7 @@ msgstr ""
 msgid "Subnet %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted already."
@@ -764,12 +766,12 @@ msgstr ""
 msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "Rangos de VLAN de red: %s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 

diff --git a/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po b/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po
index 2a8ef2ba8aeca1b02ad1c4db72f1d1ae27f52e92..30e6c4b0d617728af12b914c9784a6a6a93929c7 100644 (file)
--- a/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/fr/LC_MESSAGES/neutron-log-info.po
@@ -9,8 +9,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
-"PO-Revision-Date: 2015-04-09 01:22+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+0000\n"
+"PO-Revision-Date: 2015-04-10 13:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French (http://www.transifex.com/projects/p/neutron/language/"
 "fr/)\n"
@@ -142,7 +142,7 @@ msgstr "Etat de synchronisation"
 msgid "Synchronizing state complete"
 msgstr "Etat de synchronisation complet"
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -152,12 +152,12 @@ msgstr "agent_updated au niveau du serveur %s !"
 msgid "L3 agent started"
 msgstr "Agent de niveau 3 démarré"
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted concurrently."
@@ -286,7 +286,7 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -295,38 +295,40 @@ msgstr ""
 "La validation du routage CIDR %(new_cidr)s a échoué : il chevauche le sous-"
 "réseau %(subnet_id)s (CIDR : %(cidr)s) "
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "Adresse IP non valide trouvée dans le pool : %(start)s - %(end)s :"
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 "Les adresses IP spécifiées ne correspondent à la version IP du sous-réseau"
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 "L'adresse IP de début (%(start)s) est supérieure à l'adresse IP de fin "
 "(%(end)s)."
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 "Un pool plus volumineux que le routage CIDR de sous-réseau %(start)s - "
 "%(end)s a été trouvé."
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "Chevauchement d'intervalles trouvés : %(l_range)s et %(r_range)s"
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet %(subnet)s, "
+"cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -355,7 +357,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr ""
 
@@ -412,49 +414,49 @@ msgstr "Tâche périodique %(task)s car elle est désactivée"
 msgid "Caught %s, exiting"
 msgstr "%s interceptée, sortie"
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "Processus parent arrêté de manière inattendue, sortie"
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "L'enfant a reçu %s, sortie"
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr "Bifurcation trop rapide, pause"
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr "Enfant démarré %d"
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr "Démarrage des travailleurs %d"
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Enfant %(pid)d arrêté par le signal %(sig)d"
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Processus fils %(pid)s terminé avec le status %(code)d"
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "%s interceptée, arrêt de l'enfant"
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr "Pause demandée après suppression de thread. Nettoyage."
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "En attente %d enfants pour sortie"
@@ -736,7 +738,7 @@ msgstr "Le port %s a été effacé en même temps"
 msgid "Subnet %s was deleted concurrently"
 msgstr "Le sous-réseau %s a été effacé en même temps"
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted already."
@@ -766,12 +768,12 @@ msgstr ""
 msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "Plages de réseau local virtuel de réseau : %s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 

diff --git a/neutron/locale/it/LC_MESSAGES/neutron-log-info.po b/neutron/locale/it/LC_MESSAGES/neutron-log-info.po
index 51e74fa2d83f411d6a2617605526cf61d67cbc65..dc7928f4469d885a950771a90b2b24137fa06dc1 100644 (file)
--- a/neutron/locale/it/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/it/LC_MESSAGES/neutron-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
-"PO-Revision-Date: 2015-04-09 01:22+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+0000\n"
+"PO-Revision-Date: 2015-04-10 13:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian (http://www.transifex.com/projects/p/neutron/language/"
 "it/)\n"
@@ -141,7 +141,7 @@ msgstr "Stato sincronizzazione"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -151,12 +151,12 @@ msgstr "agent_updated dal lato server %s!"
 msgid "L3 agent started"
 msgstr "Agent L3 avviato"
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted concurrently."
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -293,35 +293,37 @@ msgstr ""
 "Convalida per CIDR: %(new_cidr)s non riuscita - si sovrappone con la "
 "sottorete %(subnet_id)s (CIDR: %(cidr)s)"
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "Trovato un indirizzo IP invalido nel pool: %(start)s - %(end)s:"
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 "Gli indirizzi IP specificati non corrispondono alla versione IP della "
 "sottorete"
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "L'IP iniziale (%(start)s) è superiore all'IP finale (%(end)s)"
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "Trovato un pool più grande della sottorete CIDR:%(start)s - %(end)s"
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "Trovati gli intervalli di sovrapposizione: %(l_range)s e %(r_range)s"
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet %(subnet)s, "
+"cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -350,7 +352,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr ""
 
@@ -408,49 +410,49 @@ msgstr "Abbadono dell'attività periodica %(task)s perché è disabilitata"
 msgid "Caught %s, exiting"
 msgstr "Rilevato %s, esistente"
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "Il processo principale è stato interrotto inaspettatamente, uscire"
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "Cogliere Child %s, uscendo"
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr "Sblocco troppo veloce, attendere"
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr "Child avviato %d"
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr "Avvio %d operatori"
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "Child %(pid)d interrotto dal segnale %(sig)d"
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Child %(pid)s terminato con stato %(code)d"
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "Intercettato %s, arresto in corso dei children"
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr ""
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "In attesa %d degli elementi secondari per uscire"
@@ -731,7 +733,7 @@ msgstr ""
 msgid "Subnet %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted already."
@@ -759,12 +761,12 @@ msgstr ""
 msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "Intervalli di rete VLAN: %s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 

diff --git a/neutron/locale/ja/LC_MESSAGES/neutron-log-info.po b/neutron/locale/ja/LC_MESSAGES/neutron-log-info.po
index 43732f94807167f3f514ecc30a23a2ac84172406..dfd024374397f6348514e143eaba460c3374ef30 100644 (file)
--- a/neutron/locale/ja/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/ja/LC_MESSAGES/neutron-log-info.po
@@ -8,8 +8,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
-"PO-Revision-Date: 2015-04-09 01:22+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+0000\n"
+"PO-Revision-Date: 2015-04-10 13:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Japanese (http://www.transifex.com/projects/p/neutron/"
 "language/ja/)\n"
@@ -141,7 +141,7 @@ msgstr "状態の同期中"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -151,12 +151,12 @@ msgstr "サーバー・サイド %s による agent_updated!"
 msgid "L3 agent started"
 msgstr "L3 エージェントが始動しました"
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted concurrently."
@@ -284,7 +284,7 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -293,34 +293,36 @@ msgstr ""
 "CIDR %(new_cidr)s の検証が失敗しました。サブネット %(subnet_id)s (CIDR: "
 "%(cidr)s) とオーバーラップしています"
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "プールで無効な IP アドレスが見つかりました: %(start)s から %(end)s:"
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr "指定された IP アドレスが、サブネット IP バージョンと一致しません"
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "開始 IP (%(start)s) が終了 IP (%(end)s) より大きくなっています"
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 "サブネット CIDR より大きいプールが見つかりました: %(start)s から %(end)s"
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "オーバーラップする範囲が見つかりました: %(l_range)s から %(r_range)s"
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet %(subnet)s, "
+"cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -349,7 +351,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr ""
 
@@ -406,49 +408,49 @@ msgstr "タスクが使用不可であるため、定期タスク %(task)s を
 msgid "Caught %s, exiting"
 msgstr "%s が見つかりました。終了しています"
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "親プロセスが予期せずに停止しました。終了しています"
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr ""
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr "fork が早すぎます。スリープ状態にしています"
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr "子 %d を開始しました"
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr "%d ワーカーを開始しています"
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "子 %(pid)d がシグナル %(sig)d によって強制終了されました"
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "子 %(pid)s が状況 %(code)d で終了しました"
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "%s が見つかりました。子を停止しています"
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr ""
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "%d 個の子で終了を待機しています"
@@ -730,7 +732,7 @@ msgstr ""
 msgid "Subnet %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted already."
@@ -758,12 +760,12 @@ msgstr ""
 msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "ネットワーク VLAN の範囲: %s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 

diff --git a/neutron/locale/ko_KR/LC_MESSAGES/neutron-log-info.po b/neutron/locale/ko_KR/LC_MESSAGES/neutron-log-info.po
index 98dae1f0438791c10fa3daf46fc06df0a2c9ed78..b115f294f09f6f6c6c2a33d73fb34237d5a6ed8f 100644 (file)
--- a/neutron/locale/ko_KR/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/ko_KR/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
-"PO-Revision-Date: 2015-04-09 01:22+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+0000\n"
+"PO-Revision-Date: 2015-04-10 13:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Korean (Korea) (http://www.transifex.com/projects/p/neutron/"
 "language/ko_KR/)\n"
@@ -140,7 +140,7 @@ msgstr "상태 동기화 중"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -150,12 +150,12 @@ msgstr "서버측 %s!에 의한 agent_updated"
 msgid "L3 agent started"
 msgstr "L3 에이전트가 시작됨"
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted concurrently."
@@ -283,7 +283,7 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -292,33 +292,35 @@ msgstr ""
 "CIDR %(new_cidr)s 유효성 검증 실패 - 서브넷 %(subnet_id)s(CIDR: %(cidr)s)과"
 "(와) 겹침"
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "풀에서 올바르지 않은 IP 주소 발견: %(start)s - %(end)s:"
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr "지정된 IP 주소가 서브넷 IP 버전과 일치하지 않음"
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "시작 IP(%(start)s)가 끝 IP(%(end)s)보다 큼"
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "서브넷 CIDR보다 큰 풀 발견: %(start)s - %(end)s"
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "겹치는 범위 발견: %(l_range)s 및 %(r_range)s"
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet %(subnet)s, "
+"cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -347,7 +349,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr ""
 
@@ -404,49 +406,49 @@ msgstr "사용 안하기 때문에 주기적 태스크 %(task)s을(를) 건너
 msgid "Caught %s, exiting"
 msgstr "%s 발견, 종료 중"
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "상위 프로세스가 예기치 않게 정지했습니다. 종료 중"
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "자식으로 된 %s가 존재함."
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr "포크가 너무 빠름. 정지 중"
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr "%d 하위를 시작했음"
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr "%d 작업자 시작 중"
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "%(pid)d 하위가 %(sig)d 신호에 의해 강제 종료됨"
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "%(pid)s 하위가 %(code)d 상태와 함께 종료했음"
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "%s 발견, 하위 중지 중"
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr ""
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "%d 하위에서 종료하기를 대기 중임"
@@ -726,7 +728,7 @@ msgstr ""
 msgid "Subnet %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted already."
@@ -754,12 +756,12 @@ msgstr ""
 msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "네트워크 VLAN 범위: %s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 

diff --git a/neutron/locale/neutron-log-error.pot b/neutron/locale/neutron-log-error.pot
index 3ee0b66fd219d2dce603394b1b7ac5062dcbdb3a..a7acbfade6d9664f5a01911207c79b553e3daaa2 100644 (file)
--- a/neutron/locale/neutron-log-error.pot
+++ b/neutron/locale/neutron-log-error.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.1.dev296\n"
+"Project-Id-Version: neutron 2015.2.dev68\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+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"
@@ -113,7 +113,7 @@ msgstr ""
 msgid "Network %s info call failed."
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:577 neutron/agent/l3/agent.py:606
+#: neutron/agent/dhcp/agent.py:577 neutron/agent/l3/agent.py:604
 #: neutron/agent/metadata/agent.py:311
 #: neutron/plugins/hyperv/agent/l2_agent.py:94
 #: neutron/plugins/ibm/agent/sdnve_neutron_agent.py:108
@@ -124,7 +124,7 @@ msgstr ""
 msgid "Failed reporting state!"
 msgstr ""
 
-#: neutron/agent/l3/agent.py:172 neutron/tests/unit/agent/l3/test_agent.py:2084
+#: neutron/agent/l3/agent.py:172 neutron/tests/unit/agent/l3/test_agent.py:2086
 #, python-format
 msgid "Error importing interface driver '%s'"
 msgstr ""
@@ -300,11 +300,11 @@ msgstr ""
 msgid "Unable to parse route \"%s\""
 msgstr ""
 
-#: neutron/agent/linux/iptables_manager.py:392
+#: neutron/agent/linux/iptables_manager.py:393
 msgid "Failure applying iptables rules"
 msgstr ""
 
-#: neutron/agent/linux/iptables_manager.py:470
+#: neutron/agent/linux/iptables_manager.py:471
 #, python-format
 msgid ""
 "IPTablesManager.apply failed to apply the following set of iptables "
@@ -327,7 +327,7 @@ msgstr ""
 msgid "Unexpected error."
 msgstr ""
 
-#: neutron/agent/ovsdb/impl_idl.py:106
+#: neutron/agent/ovsdb/impl_idl.py:104
 #, python-format
 msgid "OVSDB Error: %s"
 msgstr ""
@@ -342,21 +342,21 @@ msgstr ""
 msgid "Could not parse: %s"
 msgstr ""
 
-#: neutron/agent/ovsdb/native/commands.py:45
+#: neutron/agent/ovsdb/native/commands.py:40
 msgid "Error executing command"
 msgstr ""
 
-#: neutron/agent/ovsdb/native/commands.py:111
+#: neutron/agent/ovsdb/native/commands.py:92
 #, python-format
 msgid "Bridge %s does not exist"
 msgstr ""
 
-#: neutron/agent/ovsdb/native/commands.py:313
+#: neutron/agent/ovsdb/native/commands.py:296
 #, python-format
 msgid "Port %s does not exist"
 msgstr ""
 
-#: neutron/agent/ovsdb/native/commands.py:323
+#: neutron/agent/ovsdb/native/commands.py:307
 #, python-format
 msgid "Port %(port)s does not exist on %(bridge)s!"
 msgstr ""
@@ -500,24 +500,33 @@ msgid ""
 "package is installed. Error: %s"
 msgstr ""
 
+#: neutron/db/agents_db.py:307
+#, python-format
+msgid ""
+"Message received from the host: %(host)s during the registration of "
+"%(agent_name)s has a timestamp: %(agent_time)s. This differs from the "
+"current server timestamp: %(serv_time)s by more than the threshold agent "
+"downtime: %(threshold)s."
+msgstr ""
+
 #: neutron/db/agentschedulers_db.py:222
 #, python-format
 msgid "Failed to schedule network %s"
 msgstr ""
 
-#: neutron/db/agentschedulers_db.py:289
+#: neutron/db/agentschedulers_db.py:295
 #, python-format
 msgid ""
 "Unexpected exception occurred while removing network %(net)s from agent "
 "%(agent)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:931 neutron/plugins/ml2/plugin.py:559
+#: neutron/db/db_base_plugin_v2.py:937 neutron/plugins/ml2/plugin.py:559
 #, python-format
 msgid "An exception occurred while creating the %(resource)s:%(item)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1699
+#: neutron/db/db_base_plugin_v2.py:1751
 #, python-format
 msgid "Unable to generate mac address after %s attempts"
 msgstr ""
@@ -589,7 +598,7 @@ msgstr ""
 msgid "No handler for matches of kind %s"
 msgstr ""
 
-#: neutron/openstack/common/service.py:268
+#: neutron/openstack/common/service.py:276
 msgid "Unhandled exception"
 msgstr ""
 
@@ -741,7 +750,7 @@ msgid "Parsing physical_interface_mappings failed: %s. Agent terminated!"
 msgstr ""
 
 #: neutron/plugins/ml2/db.py:242 neutron/plugins/ml2/db.py:327
-#: neutron/plugins/ml2/plugin.py:1310
+#: neutron/plugins/ml2/plugin.py:1326
 #, python-format
 msgid "Multiple ports have port_id starting with %s"
 msgstr ""
@@ -851,41 +860,41 @@ msgstr ""
 msgid "mechanism_manager.create_subnet_postcommit failed, deleting subnet '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:908
+#: neutron/plugins/ml2/plugin.py:924
 #, python-format
 msgid "Exception deleting fixed_ip from port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:917
+#: neutron/plugins/ml2/plugin.py:933
 msgid "mechanism_manager.delete_subnet_postcommit failed"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:982
+#: neutron/plugins/ml2/plugin.py:998
 #, python-format
 msgid "mechanism_manager.create_port_postcommit failed, deleting port '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:994
+#: neutron/plugins/ml2/plugin.py:1010
 #, python-format
 msgid "_bind_port_if_needed failed, deleting port '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1024
+#: neutron/plugins/ml2/plugin.py:1040
 #, python-format
 msgid "_bind_port_if_needed failed. Deleting all ports from create bulk '%s'"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1169
+#: neutron/plugins/ml2/plugin.py:1185
 #, python-format
 msgid "No Host supplied to bind DVR Port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1291
+#: neutron/plugins/ml2/plugin.py:1307
 #, python-format
 msgid "mechanism_manager.delete_port_postcommit failed for port %s"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1323
+#: neutron/plugins/ml2/plugin.py:1339
 #, python-format
 msgid "Binding info for DVR port %s not found"
 msgstr ""
@@ -899,15 +908,15 @@ msgstr ""
 msgid "Skipping unreasonable gre ID range %(tun_min)s:%(tun_max)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:96
+#: neutron/plugins/ml2/drivers/type_vlan.py:94
 msgid "Failed to parse network_vlan_ranges. Service terminated!"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:88
+#: neutron/plugins/ml2/drivers/type_vxlan.py:85
 msgid "Failed to parse vni_ranges. Service terminated!"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:98
+#: neutron/plugins/ml2/drivers/type_vxlan.py:95
 #, python-format
 msgid "Skipping unreasonable VXLAN VNI range %(tun_min)s:%(tun_max)s"
 msgstr ""
@@ -1172,7 +1181,7 @@ msgstr ""
 msgid "Agent Initialization Failed"
 msgstr ""
 
-#: neutron/scheduler/l3_agent_scheduler.py:287
+#: neutron/scheduler/l3_agent_scheduler.py:288
 #, python-format
 msgid "Not enough candidates, a HA router needs at least %s agents"
 msgstr ""

diff --git a/neutron/locale/neutron-log-info.pot b/neutron/locale/neutron-log-info.pot
index 54d917dd36e49d1a6001bfb730a18eafe1ce521c..cb4d5b288691603c2a93ed109c6950ac3e2dd9c3 100644 (file)
--- a/neutron/locale/neutron-log-info.pot
+++ b/neutron/locale/neutron-log-info.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.1.dev296\n"
+"Project-Id-Version: neutron 2015.2.dev68\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+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"
@@ -139,7 +139,7 @@ msgstr ""
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -149,12 +149,12 @@ msgstr ""
 msgid "L3 agent started"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted "
@@ -280,40 +280,42 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet "
+"%(subnet)s, cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -342,7 +344,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr ""
 
@@ -399,49 +401,49 @@ msgstr ""
 msgid "Caught %s, exiting"
 msgstr ""
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr ""
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr ""
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr ""
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr ""
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr ""
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr ""
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr ""
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr ""
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr ""
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr ""
@@ -718,7 +720,7 @@ msgstr ""
 msgid "Subnet %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted "
@@ -747,12 +749,12 @@ msgstr ""
 msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr ""
 

diff --git a/neutron/locale/neutron.pot b/neutron/locale/neutron.pot
index eb72e9dc0f4163a2df8a281bd2f2135524ac9aa2..c8381df1eeff0b5c290ff917181f4081559b9f91 100644 (file)
--- a/neutron/locale/neutron.pot
+++ b/neutron/locale/neutron.pot
@@ -6,9 +6,9 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: neutron 2015.1.dev296\n"
+"Project-Id-Version: neutron 2015.2.dev68\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+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"
@@ -431,19 +431,19 @@ msgstr ""
 msgid "Iptables mangle mark used to mark ingress from external network"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:36
+#: neutron/agent/l3/ha.py:35
 msgid "Location to store keepalived/conntrackd config files"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:41
+#: neutron/agent/l3/ha.py:40
 msgid "VRRP authentication type"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:43
+#: neutron/agent/l3/ha.py:42
 msgid "VRRP authentication password"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:47
+#: neutron/agent/l3/ha.py:46
 msgid "The advertisement interval in seconds"
 msgstr ""
 
@@ -614,7 +614,7 @@ msgstr ""
 msgid "ip link capability %(capability)s is not supported"
 msgstr ""
 
-#: neutron/agent/linux/iptables_manager.py:200
+#: neutron/agent/linux/iptables_manager.py:202
 #, python-format
 msgid "Unknown chain: %r"
 msgstr ""
@@ -752,7 +752,9 @@ msgid ""
 msgstr ""
 
 #: neutron/agent/metadata/config.py:126
-msgid "Number of separate worker processes for metadata server"
+msgid ""
+"Number of separate worker processes for metadata server (defaults to half"
+" of the number of CPUs)"
 msgstr ""
 
 #: neutron/agent/metadata/config.py:130
@@ -803,9 +805,22 @@ msgstr ""
 msgid "The connection string for the native OVSDB backend"
 msgstr ""
 
-#: neutron/agent/ovsdb/native/commands.py:29
+#: neutron/agent/ovsdb/native/idlutils.py:48
 #, python-format
-msgid "Table %(table)s has no row with %(col)s=%(match)s"
+msgid "Cannot find %(table)s with %(col)s=%(match)s"
+msgstr ""
+
+#: neutron/agent/ovsdb/native/idlutils.py:78
+#, python-format
+msgid "Table %s can only be queried by UUID"
+msgstr ""
+
+#: neutron/agent/ovsdb/native/idlutils.py:80
+msgid "'.' searches are not implemented"
+msgstr ""
+
+#: neutron/agent/ovsdb/native/idlutils.py:85
+msgid "record"
 msgstr ""
 
 #: neutron/agent/windows/utils.py:54
@@ -1828,34 +1843,34 @@ msgstr ""
 msgid "Bad prefix type for generate IPv6 address by EUI-64: %s"
 msgstr ""
 
-#: neutron/common/utils.py:203
+#: neutron/common/utils.py:202
 #: neutron/plugins/sriovnicagent/common/config.py:36
 #, python-format
 msgid "Invalid mapping: '%s'"
 msgstr ""
 
-#: neutron/common/utils.py:206
+#: neutron/common/utils.py:205
 #: neutron/plugins/sriovnicagent/common/config.py:39
 #, python-format
 msgid "Missing key in mapping: '%s'"
 msgstr ""
 
-#: neutron/common/utils.py:209
+#: neutron/common/utils.py:208
 #, python-format
 msgid "Missing value in mapping: '%s'"
 msgstr ""
 
-#: neutron/common/utils.py:211
+#: neutron/common/utils.py:210
 #, python-format
 msgid "Key %(key)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: neutron/common/utils.py:214
+#: neutron/common/utils.py:213
 #, python-format
 msgid "Value %(value)s in mapping: '%(mapping)s' not unique"
 msgstr ""
 
-#: neutron/common/utils.py:420
+#: neutron/common/utils.py:407
 msgid "Illegal IP version number"
 msgstr ""
 
@@ -1932,30 +1947,30 @@ msgstr ""
 msgid "Exceeded maximim amount of fixed ips per port"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:615
+#: neutron/db/db_base_plugin_v2.py:621
 msgid "0 is not allowed as CIDR prefix length"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:625
+#: neutron/db/db_base_plugin_v2.py:631
 #, python-format
 msgid ""
 "Requested subnet with cidr: %(cidr)s for network: %(network_id)s overlaps"
 " with another subnet"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:710 neutron/db/db_base_plugin_v2.py:714
+#: neutron/db/db_base_plugin_v2.py:716 neutron/db/db_base_plugin_v2.py:720
 #, python-format
 msgid "Invalid route: %s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:792
+#: neutron/db/db_base_plugin_v2.py:798
 #, python-format
 msgid ""
 "Invalid CIDR %s for IPv6 address mode. OpenStack uses the EUI-64 address "
 "format, which requires the prefix to be /64."
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:800
+#: neutron/db/db_base_plugin_v2.py:806
 #, python-format
 msgid ""
 "ipv6_ra_mode set to '%(ra_mode)s' with ipv6_address_mode set to "
@@ -1963,68 +1978,68 @@ msgid ""
 "the same value"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:808
+#: neutron/db/db_base_plugin_v2.py:814
 msgid ""
 "ipv6_ra_mode or ipv6_address_mode cannot be set when enable_dhcp is set "
 "to False."
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:814
+#: neutron/db/db_base_plugin_v2.py:820
 msgid "Cannot disable enable_dhcp with ipv6 attributes set"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1030
+#: neutron/db/db_base_plugin_v2.py:1036
 #, python-format
 msgid "%(name)s '%(addr)s' does not match the ip_version '%(ip_version)s'"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1054
+#: neutron/db/db_base_plugin_v2.py:1060
 msgid "Gateway is not valid on subnet"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1074 neutron/db/db_base_plugin_v2.py:1088
+#: neutron/db/db_base_plugin_v2.py:1080 neutron/db/db_base_plugin_v2.py:1094
 #: neutron/plugins/opencontrail/contrail_plugin.py:312
 msgid "new subnet"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1081
+#: neutron/db/db_base_plugin_v2.py:1087
 #, python-format
 msgid "Error parsing dns address %s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1097
+#: neutron/db/db_base_plugin_v2.py:1103
 msgid "ipv6_ra_mode is not valid when ip_version is 4"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1101
+#: neutron/db/db_base_plugin_v2.py:1107
 msgid "ipv6_address_mode is not valid when ip_version is 4"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1234
+#: neutron/db/db_base_plugin_v2.py:1240
 msgid "allocation_pools allowed only for specific subnet requests."
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1314
+#: neutron/db/db_base_plugin_v2.py:1320
 msgid "ip_version must be specified in the absence of cidr and subnetpool_id"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1331
+#: neutron/db/db_base_plugin_v2.py:1337
 msgid "cidr and prefixlen must not be supplied together"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1342
+#: neutron/db/db_base_plugin_v2.py:1348
 msgid "A cidr must be specified in the absence of a subnet pool"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1593
+#: neutron/db/db_base_plugin_v2.py:1645
 msgid "Existing prefixes must be a subset of the new prefixes"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1660
+#: neutron/db/db_base_plugin_v2.py:1712
 msgid "Subnet pool has existing allocations"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:1667
+#: neutron/db/db_base_plugin_v2.py:1719
 msgid "mac address update"
 msgstr ""
 
@@ -2276,57 +2291,57 @@ msgstr ""
 msgid "Package neutron-%s not installed"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:91
+#: neutron/db/migration/migrate_to_ml2.py:90
 msgid "Missing version in alembic_versions table"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:93
+#: neutron/db/migration/migrate_to_ml2.py:92
 #, python-format
 msgid "Multiple versions in alembic_versions table: %s"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:97
+#: neutron/db/migration/migrate_to_ml2.py:96
 #, python-format
 msgid ""
 "Unsupported database schema %(current)s. Please migrate your database to "
 "one of following versions: %(supported)s"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:447
+#: neutron/db/migration/migrate_to_ml2.py:446
 #, python-format
 msgid "Unknown tunnel type: %s"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:481
+#: neutron/db/migration/migrate_to_ml2.py:480
 msgid "The plugin type whose database will be migrated"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:484
+#: neutron/db/migration/migrate_to_ml2.py:483
 msgid "The connection url for the target db"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:487
+#: neutron/db/migration/migrate_to_ml2.py:486
 #, python-format
 msgid "The %s tunnel type to migrate from"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:490
+#: neutron/db/migration/migrate_to_ml2.py:489
 #: neutron/plugins/openvswitch/common/config.py:65
 msgid "The UDP port to use for VXLAN tunnels."
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:493
+#: neutron/db/migration/migrate_to_ml2.py:492
 msgid "Retain the old plugin's tables"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:499
+#: neutron/db/migration/migrate_to_ml2.py:498
 #, python-format
 msgid ""
 "Tunnel args (tunnel-type and vxlan-udp-port) are not valid for the %s "
 "plugin"
 msgstr ""
 
-#: neutron/db/migration/migrate_to_ml2.py:506
+#: neutron/db/migration/migrate_to_ml2.py:505
 #, python-format
 msgid ""
 "Support for migrating %(plugin)s for release %(release)s is not yet "
@@ -3291,98 +3306,98 @@ msgstr ""
 msgid "Some config files were not parsed properly"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:597
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:598
 #, python-format
 msgid "Unreasonable vxlan ID range %(vxlan_min)s - %(vxlan_max)s"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:893
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:947
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:894
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:948
 msgid "Invalid profile type"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1139
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1140
 msgid "segment_range not required for TRUNK"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1145
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1146
 msgid "multicast_ip_range not required"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1274
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1275
 msgid "Invalid segment range. example range: 500-550"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1287
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1288
 msgid "Invalid multicast ip address range. example range: 224.1.1.1-224.1.1.10"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1294
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1295
 #, python-format
 msgid "%s is not a valid multicast ip address"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1298
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1299
 #, python-format
 msgid "%s is reserved multicast ip address"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1302
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1303
 #, python-format
 msgid "%s is not a valid ip address"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1306
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1307
 #, python-format
 msgid ""
 "Invalid multicast IP range '%(min_ip)s-%(max_ip)s': Range should be from "
 "low address to high address"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1319
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1320
 msgid "Arguments segment_type missing for network profile"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1328
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1329
 msgid "segment_type should either be vlan, overlay, multi-segment or trunk"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1334
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1335
 msgid "Argument physical_network missing for network profile"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1340
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1341
 msgid "segment_range not required for trunk"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1346
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1347
 msgid "Argument sub_type missing for network profile"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1353
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1354
 msgid "Argument segment_range missing for network profile"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1364
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1365
 msgid "Argument multicast_ip_range missing for VXLAN multicast network profile"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1392
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1393
 #, python-format
 msgid "Segment range is invalid, select from %(min)s-%(nmin)s, %(nmax)s-%(max)s"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1410
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1411
 #, python-format
 msgid "segment range is invalid. Valid range is : %(min)s-%(max)s"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1424
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1425
 #, python-format
 msgid "NetworkProfile name %s already exists"
 msgstr ""
 
-#: neutron/plugins/cisco/db/n1kv_db_v2.py:1441
+#: neutron/plugins/cisco/db/n1kv_db_v2.py:1442
 msgid "Segment range overlaps with another profile"
 msgstr ""
 
@@ -3483,21 +3498,21 @@ msgstr ""
 msgid "Cannot delete network '%s' that is a member of a multi-segment network"
 msgstr ""
 
-#: neutron/plugins/common/utils.py:33
+#: neutron/plugins/common/utils.py:44
 #, python-format
 msgid "%(id)s is not a valid %(type)s identifier"
 msgstr ""
 
-#: neutron/plugins/common/utils.py:38
+#: neutron/plugins/common/utils.py:49
 msgid "End of tunnel range is less than start of tunnel range"
 msgstr ""
 
-#: neutron/plugins/common/utils.py:48
+#: neutron/plugins/common/utils.py:59
 #, python-format
 msgid "%s is not a valid VLAN tag"
 msgstr ""
 
-#: neutron/plugins/common/utils.py:52
+#: neutron/plugins/common/utils.py:63
 msgid "End of VLAN range is less than start of VLAN range"
 msgstr ""
 
@@ -4050,7 +4065,7 @@ msgstr ""
 msgid "Network type value '%s' not supported"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:39
+#: neutron/plugins/ml2/drivers/type_vlan.py:37
 msgid ""
 "List of <physical_network>:<vlan_min>:<vlan_max> or <physical_network> "
 "specifying physical_network names usable for VLAN provider and tenant "
@@ -4058,32 +4073,32 @@ msgid ""
 " to tenant networks."
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:176
+#: neutron/plugins/ml2/drivers/type_vlan.py:174
 #, python-format
 msgid "physical_network '%s' unknown  for VLAN provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:181
+#: neutron/plugins/ml2/drivers/type_vlan.py:179
 #, python-format
 msgid "segmentation_id out of range (%(min)s through %(max)s)"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:187
+#: neutron/plugins/ml2/drivers/type_vlan.py:185
 msgid "segmentation_id requires physical_network for VLAN provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:195
+#: neutron/plugins/ml2/drivers/type_vlan.py:193
 #, python-format
 msgid "%s prohibited for VLAN provider network"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:38
+#: neutron/plugins/ml2/drivers/type_vxlan.py:35
 msgid ""
 "Comma-separated list of <vni_min>:<vni_max> tuples enumerating ranges of "
 "VXLAN VNI IDs that are available for tenant network allocation"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vxlan.py:42
+#: neutron/plugins/ml2/drivers/type_vxlan.py:39
 msgid "Multicast group for VXLAN. If unset, disables VXLAN multicast mode."
 msgstr ""
 
@@ -5027,8 +5042,8 @@ msgstr ""
 msgid "Keepalived didn't respawn"
 msgstr ""
 
-#: neutron/tests/unit/agent/linux/test_iptables_manager.py:842
-#: neutron/tests/unit/agent/linux/test_iptables_manager.py:876
+#: neutron/tests/unit/agent/linux/test_iptables_manager.py:839
+#: neutron/tests/unit/agent/linux/test_iptables_manager.py:873
 #, python-format
 msgid ""
 "IPTablesManager.apply failed to apply the following set of iptables "
@@ -5047,12 +5062,12 @@ msgid ""
 "operation."
 msgstr ""
 
-#: neutron/tests/unit/plugins/ml2/test_plugin.py:310
+#: neutron/tests/unit/plugins/ml2/test_plugin.py:349
 #, python-format
 msgid "Deleting port %s"
 msgstr ""
 
-#: neutron/tests/unit/plugins/ml2/test_plugin.py:311
+#: neutron/tests/unit/plugins/ml2/test_plugin.py:350
 #, python-format
 msgid "The port '%s' was deleted"
 msgstr ""
@@ -5084,8 +5099,8 @@ msgstr ""
 msgid "Adds test attributes to core resources."
 msgstr ""
 
-#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:961
-#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:978
+#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:962
+#: neutron/tests/unit/plugins/openvswitch/agent/test_ovs_neutron_agent.py:979
 #, python-format
 msgid "Failed to set-up %(type)s tunnel port to %(ip)s"
 msgstr ""

diff --git a/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po b/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po
index 4468ce1151a788d61aa8db3affb5249e9d1df86f..1395c42bc4e7f4cc06acd3b672dba883679e0208 100644 (file)
--- a/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/pt_BR/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
-"PO-Revision-Date: 2015-04-09 01:22+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+0000\n"
+"PO-Revision-Date: 2015-04-10 13:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Portuguese (Brazil) (http://www.transifex.com/projects/p/"
 "neutron/language/pt_BR/)\n"
@@ -142,7 +142,7 @@ msgstr "Sincronizando estado"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -152,12 +152,12 @@ msgstr "agent_updated por lado do servidor %s!"
 msgid "L3 agent started"
 msgstr "Agente L3 iniciado"
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted concurrently."
@@ -285,7 +285,7 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -294,33 +294,35 @@ msgstr ""
 "A validação para CIDR: %(new_cidr)s falhou - se sobrepõe com a sub-rede "
 "%(subnet_id)s (CIDR: %(cidr)s)"
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "Localizado endereço IP inválido no pool: %(start)s - %(end)s:"
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr "Endereços IP especificado não correspondem à versão do IP da sub-rede"
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "IP inicial (%(start)s) é maior que IP final (%(end)s)"
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "Localizado pool maior que a sub-rede CIDR:%(start)s - %(end)s"
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "Localizados intervalos de sobreposição: %(l_range)s e %(r_range)s"
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet %(subnet)s, "
+"cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -349,7 +351,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr ""
 
@@ -406,49 +408,49 @@ msgstr "Ignorando tarefa periódica %(task)s porque ela está desativada"
 msgid "Caught %s, exiting"
 msgstr "%s capturadas, saindo"
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "Processo pai saiu inesperadamente, saindo"
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "Filho capturado %s, terminando"
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr "Bifurcação muito rápida, suspendendo"
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr "Filho %d iniciado"
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr "Iniciando %d trabalhadores"
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "%(pid)d filho eliminado pelo sinal %(sig)d"
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "Filho %(pid)s encerrando com status %(code)d"
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "%s capturado, parando filhos"
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr ""
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "Aguardando em %d filhos para sair"
@@ -732,7 +734,7 @@ msgstr ""
 msgid "Subnet %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted already."
@@ -760,12 +762,12 @@ msgstr "Inicialização do ML2 LocalTypeDriver concluída"
 msgid "%(type)s ID ranges: %(range)s"
 msgstr "%(type)s faixas de ID: %(range)s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "Intervalos de VLAN de rede: %s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr "Inicialização do VlanTypeDriver concluída"
 

diff --git a/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po b/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
index c747e11fbf242d8e472f83b0e406ec6184371a88..e4e89833831772264036decdefea001d1b200c5e 100644 (file)
--- a/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/zh_CN/LC_MESSAGES/neutron-log-info.po
@@ -8,9 +8,9 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
-"PO-Revision-Date: 2015-04-09 06:52+0000\n"
-"Last-Translator: 汪军 <wwyyzz08@sina.com>\n"
+"POT-Creation-Date: 2015-04-16 06:13+0000\n"
+"PO-Revision-Date: 2015-04-10 13:03+0000\n"
+"Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (China) (http://www.transifex.com/projects/p/neutron/"
 "language/zh_CN/)\n"
 "Language: zh_CN\n"
@@ -141,7 +141,7 @@ msgstr "正在使状态同步"
 msgid "Synchronizing state complete"
 msgstr "同步状态完成"
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -151,12 +151,12 @@ msgstr "服务器端 %s 已更新代理！"
 msgid "L3 agent started"
 msgstr "已启动 L3 代理"
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr "路由器%(router_id)s 转换为%(state)s"
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted concurrently."
@@ -282,7 +282,7 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr "在主机 %(host)s上添加网络%(net)s到代理%(agent)%s"
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -291,33 +291,35 @@ msgstr ""
 "针对 CIDR %(new_cidr)s 的验证失败 - 与子网 %(subnet_id)s（CIDR 为 %(cidr)s）"
 "重叠"
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "在池中找到无效 IP 地址：%(start)s - %(end)s："
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr "指定的 IP 地址与子网 IP 版本不匹配"
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "起始 IP (%(start)s) 大于结束 IP (%(end)s)"
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "找到超过子网 CIDR (%(start)s - %(end)s) 的池"
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "找到重叠范围：%(l_range)s 和 %(r_range)s"
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet %(subnet)s, "
+"cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -346,7 +348,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr "SNAT 已经绑定到服务节点。"
 
@@ -403,49 +405,49 @@ msgstr "正在跳过周期性任务 %(task)s，因为它已禁用"
 msgid "Caught %s, exiting"
 msgstr "捕获到 %s，正在退出"
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "父进程已意外终止，正在退出"
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr "子代捕获 %s，正在退出"
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr "派生速度太快，正在休眠"
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr "已启动子代 %d"
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr "正在启动 %d 工作程序"
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "信号 %(sig)d 已终止子代 %(pid)d"
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "子代 %(pid)s 已退出，状态为 %(code)d"
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "捕获到 %s，正在停止子代"
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr "线程结束，正在清理"
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "正在等待 %d 个子代退出"
@@ -725,7 +727,7 @@ msgstr "端口 %s 被同时删除"
 msgid "Subnet %s was deleted concurrently"
 msgstr "子网 %s 同时被删除 "
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted already."
@@ -753,12 +755,12 @@ msgstr "完成L2插件模块初始化"
 msgid "%(type)s ID ranges: %(range)s"
 msgstr "%(type)s ID 范围: %(range)s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "网络 VLAN 范围：%s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr "Vlan类型驱动初始化完成"
 

diff --git a/neutron/locale/zh_TW/LC_MESSAGES/neutron-log-info.po b/neutron/locale/zh_TW/LC_MESSAGES/neutron-log-info.po
index c9869c884e3537b9c273ec85609729b04f61329c..fb30f1100ca4a495e7c2e92852cd65e8f8ed4bdf 100644 (file)
--- a/neutron/locale/zh_TW/LC_MESSAGES/neutron-log-info.po
+++ b/neutron/locale/zh_TW/LC_MESSAGES/neutron-log-info.po
@@ -7,8 +7,8 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Neutron\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2015-04-09 06:58+0000\n"
-"PO-Revision-Date: 2015-04-09 01:22+0000\n"
+"POT-Creation-Date: 2015-04-16 06:13+0000\n"
+"PO-Revision-Date: 2015-04-10 13:03+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Chinese (Taiwan) (http://www.transifex.com/projects/p/neutron/"
 "language/zh_TW/)\n"
@@ -140,7 +140,7 @@ msgstr "正在同步化狀態"
 msgid "Synchronizing state complete"
 msgstr ""
 
-#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:611
+#: neutron/agent/dhcp/agent.py:586 neutron/agent/l3/agent.py:609
 #: neutron/services/metering/agents/metering_agent.py:286
 #, python-format
 msgid "agent_updated by server side %s!"
@@ -150,12 +150,12 @@ msgstr "agent_updated 是由伺服器端 %s 執行！"
 msgid "L3 agent started"
 msgstr "已啟動 L3 代理程式"
 
-#: neutron/agent/l3/ha.py:114
+#: neutron/agent/l3/ha.py:113
 #, python-format
 msgid "Router %(router_id)s transitioned to %(state)s"
 msgstr ""
 
-#: neutron/agent/l3/ha.py:124
+#: neutron/agent/l3/ha.py:123
 #, python-format
 msgid ""
 "Router %s is not managed by this agent. It was possibly deleted concurrently."
@@ -281,7 +281,7 @@ msgstr ""
 msgid "Adding network %(net)s to agent %(agent)%s on host %(host)s"
 msgstr ""
 
-#: neutron/db/db_base_plugin_v2.py:630
+#: neutron/db/db_base_plugin_v2.py:636
 #, python-format
 msgid ""
 "Validation for CIDR: %(new_cidr)s failed - overlaps with subnet "
@@ -289,33 +289,35 @@ msgid ""
 msgstr ""
 "驗證 CIDR %(new_cidr)s 失敗 - 與子網路 %(subnet_id)s (CIDR %(cidr)s) 重疊"
 
-#: neutron/db/db_base_plugin_v2.py:657
+#: neutron/db/db_base_plugin_v2.py:663
 #, python-format
 msgid "Found invalid IP address in pool: %(start)s - %(end)s:"
 msgstr "在儲存區中發現無效的 IP 位址：%(start)s - %(end)s："
 
-#: neutron/db/db_base_plugin_v2.py:664
+#: neutron/db/db_base_plugin_v2.py:670
 msgid "Specified IP addresses do not match the subnet IP version"
 msgstr "指定的 IP 位址與子網路 IP 版本不符"
 
-#: neutron/db/db_base_plugin_v2.py:668
+#: neutron/db/db_base_plugin_v2.py:674
 #, python-format
 msgid "Start IP (%(start)s) is greater than end IP (%(end)s)"
 msgstr "起始 IP (%(start)s) 大於結尾 IP (%(end)s)"
 
-#: neutron/db/db_base_plugin_v2.py:673
+#: neutron/db/db_base_plugin_v2.py:679
 #, python-format
 msgid "Found pool larger than subnet CIDR:%(start)s - %(end)s"
 msgstr "找到的儲存區大於子網路 CIDR：%(start)s - %(end)s"
 
-#: neutron/db/db_base_plugin_v2.py:697
+#: neutron/db/db_base_plugin_v2.py:703
 #, python-format
 msgid "Found overlapping ranges: %(l_range)s and %(r_range)s"
 msgstr "發現重疊的範圍：%(l_range)s 及 %(r_range)s"
 
-#: neutron/db/db_base_plugin_v2.py:1517
+#: neutron/db/db_base_plugin_v2.py:1567 neutron/plugins/ml2/plugin.py:883
 #, python-format
-msgid "Found IP allocation %(alloc)s on subnet %(subnet)s, cannot delete"
+msgid ""
+"Found port (%(port_id)s, %(ip)s) having IP allocation on subnet %(subnet)s, "
+"cannot delete"
 msgstr ""
 
 #: neutron/db/l3_agentschedulers_db.py:78
@@ -344,7 +346,7 @@ msgstr ""
 msgid "SNAT interface port list does not exist, so create one: %s"
 msgstr ""
 
-#: neutron/db/l3_dvrscheduler_db.py:312
+#: neutron/db/l3_dvrscheduler_db.py:315
 msgid "SNAT already bound to a service node."
 msgstr ""
 
@@ -401,49 +403,49 @@ msgstr "正在跳過定期作業 %(task)s，因為它已停用"
 msgid "Caught %s, exiting"
 msgstr "已捕捉到 %s，正在結束"
 
-#: neutron/openstack/common/service.py:231
+#: neutron/openstack/common/service.py:239
 msgid "Parent process has died unexpectedly, exiting"
 msgstr "母程序已非預期地當掉，正在結束"
 
-#: neutron/openstack/common/service.py:262
+#: neutron/openstack/common/service.py:270
 #, python-format
 msgid "Child caught %s, exiting"
 msgstr ""
 
-#: neutron/openstack/common/service.py:301
+#: neutron/openstack/common/service.py:309
 msgid "Forking too fast, sleeping"
 msgstr "分岔太快，正在休眠"
 
-#: neutron/openstack/common/service.py:320
+#: neutron/openstack/common/service.py:328
 #, python-format
 msgid "Started child %d"
 msgstr "已開始子行程 %d"
 
-#: neutron/openstack/common/service.py:330
+#: neutron/openstack/common/service.py:338
 #, python-format
 msgid "Starting %d workers"
 msgstr "正在啟動 %d 個工作程式"
 
-#: neutron/openstack/common/service.py:347
+#: neutron/openstack/common/service.py:355
 #, python-format
 msgid "Child %(pid)d killed by signal %(sig)d"
 msgstr "信號 %(sig)d 結束了子項 %(pid)d"
 
-#: neutron/openstack/common/service.py:351
+#: neutron/openstack/common/service.py:359
 #, python-format
 msgid "Child %(pid)s exited with status %(code)d"
 msgstr "子項 %(pid)s 已結束，狀態為 %(code)d"
 
-#: neutron/openstack/common/service.py:390
+#: neutron/openstack/common/service.py:398
 #, python-format
 msgid "Caught %s, stopping children"
 msgstr "已捕捉到 %s，正在停止子項"
 
-#: neutron/openstack/common/service.py:399
+#: neutron/openstack/common/service.py:413
 msgid "Wait called after thread killed. Cleaning up."
 msgstr ""
 
-#: neutron/openstack/common/service.py:415
+#: neutron/openstack/common/service.py:429
 #, python-format
 msgid "Waiting on %d children to exit"
 msgstr "正在等待 %d 個子項結束"
@@ -723,7 +725,7 @@ msgstr ""
 msgid "Subnet %s was deleted concurrently"
 msgstr ""
 
-#: neutron/plugins/ml2/plugin.py:1336
+#: neutron/plugins/ml2/plugin.py:1352
 #, python-format
 msgid ""
 "Binding info for port %s was not found, it might have been deleted already."
@@ -751,12 +753,12 @@ msgstr ""
 msgid "%(type)s ID ranges: %(range)s"
 msgstr ""
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:99
+#: neutron/plugins/ml2/drivers/type_vlan.py:97
 #, python-format
 msgid "Network VLAN ranges: %s"
 msgstr "網路 VLAN 範圍：%s"
 
-#: neutron/plugins/ml2/drivers/type_vlan.py:166
+#: neutron/plugins/ml2/drivers/type_vlan.py:164
 msgid "VlanTypeDriver initialization complete"
 msgstr ""