Imported Translations from Transifex

Change-Id: I336530a54ca7154d0de43eccb87bc5b1c2202097

diff --git a/quantum/locale/bg_BG/LC_MESSAGES/quantum.po b/quantum/locale/bg_BG/LC_MESSAGES/quantum.po
index 5cea0b759265173406ab55d2e36b313b9bf7b5e4..2bd7890e422bff773b2078a216c2c34c0ecff4fd 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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) "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/cs/LC_MESSAGES/quantum.po b/quantum/locale/cs/LC_MESSAGES/quantum.po
index 387f18ead0c2c58af051c203f5daa5fb2264e7cc..47337cba192414a9b47cba614bf0266c1d8b9861 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 12:11+0000\n"
 "PO-Revision-Date: 2013-01-28 21:54+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: Czech "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/da/LC_MESSAGES/quantum.po b/quantum/locale/da/LC_MESSAGES/quantum.po
index 41f27968c1c71b43569ea4f6b8bb9a8505f6f1e2..70f2809f611f121defd3abe96f442e601056d01f 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 12:11+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Danish "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/de/LC_MESSAGES/quantum.po b/quantum/locale/de/LC_MESSAGES/quantum.po
index 76019e411e8c0149d9ff0d7fff01523a8940971b..408bc21c4a918ac520e0e4155b1099c5f1fbfeba 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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 "
@@ -748,73 +748,69 @@ msgid "Location to store DHCP server config files"
 msgstr "Position zum Speichern von Konfigurationsdateien des DHCP-Servers"
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr "Laufzeit von DHCP-Lease in Sekunden"
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr "Für das Erstellen von Hostnamen zu verwendende Domäne"
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr "Standard-'dnsmasq'-Einstellungen mit dieser Datei außer Kraft setzen"
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr "Anderen DNS-Server vor allen in '/etc/resolv.conf' verwenden."
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr "DHCP für %(net_id)s-PID %(pid)d ist veraltet. Befehl wird ignoriert"
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr "Kein DHCP für %s gestartet"
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr "Fehler beim Lesen von %s"
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr "Wert in %s kann nicht konvertiert werden"
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr "Kein Zugriff auf %s möglich"
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 "'dhcpmasq' für Netz wird beendet, da alle Teilnetze DHCP ausgeschaltet "
 "haben: %s"
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr "Neuladen von Zuordnungen für Netz: %s"
@@ -1605,45 +1601,45 @@ msgstr "Maximale Anzahl an Hostroutes pro Teilnetz"
 msgid "Maximum number of fixed ips per port"
 msgstr "Maximale Anzahl an statischen IP-Adressen per Port"
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr "DHCP-Leasedauer"
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 "Senden von Benachrichtigungen zu Ressourcenoperationen an den DHCP-"
 "Agenten zulassen"
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr "Überschneidung bei IP-Support in Quantum zulassen"
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr "Name von Host, auf dem Quantum ausgeführt wird"
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 "Stellen Sie sicher, dass sich das konfigurierte Gateway auf dem Teilnetz "
 "befindet"
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr "Basis-MAC-Adresse: %s"
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr "Protokollfunktion aktiviert!"
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr "Konfigurations-Paste-Datei: %s"
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -9297,3 +9293,6 @@ msgstr "lSwitch: %s nicht gefunden"
 msgid "lrouter:%s not found"
 msgstr "lRouter: %s nicht gefunden"
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr "Laufzeit von DHCP-Lease in Sekunden"
+

diff --git a/quantum/locale/es/LC_MESSAGES/quantum.po b/quantum/locale/es/LC_MESSAGES/quantum.po
index b73805b4871952b18ba70e18d02a0ca586c643e2..21628c3ac74ab0b927345f22966925ed6a6d2944 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Spanish "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/fi_FI/LC_MESSAGES/quantum.po b/quantum/locale/fi_FI/LC_MESSAGES/quantum.po
index 0ba09b40e08218dfcce80c7c67cc43041daed899..8710f1cd62c5827af4bcd3c7bdf376c9836d985a 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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) "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/fr/LC_MESSAGES/quantum.po b/quantum/locale/fr/LC_MESSAGES/quantum.po
index dfef154e240577ffb6ba565f3cb4147f75d91f00..e853fbfe29fec9c666994eae91b4221f6212cca2 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: French "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/it/LC_MESSAGES/quantum.po b/quantum/locale/it/LC_MESSAGES/quantum.po
index eed3af1609000c457095782ba4294f083140cd9e..538d34254d672c22bb67f3584154ba99faa24916 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 12:11+0000\n"
 "PO-Revision-Date: 2013-05-16 09:23+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Italian "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/ja/LC_MESSAGES/quantum.po b/quantum/locale/ja/LC_MESSAGES/quantum.po
index dca9e7b6d86172b36b28c7e42d13cde7381b9c14..a79873ea5b007bad8cc06409166c7b9598f33d90 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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 "
@@ -722,71 +722,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1531,41 +1527,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8652,3 +8648,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/ka_GE/LC_MESSAGES/quantum.po b/quantum/locale/ka_GE/LC_MESSAGES/quantum.po
index 744615115d11b1648e07ea3d903f614258abed8a..b4c4df2b0c03e676c1828104df07833cbcb884eb 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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"
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr "შეცდომა %s წაკითხვისას"
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr "ლოგირება ჩართულია!"
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8652,3 +8648,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/ko_KR/LC_MESSAGES/quantum.po b/quantum/locale/ko_KR/LC_MESSAGES/quantum.po
index daabffe5999b506a38aa602aedc7ca40fa62586e..119d44734843f057efbc7d863dfdced61eb1a1e0 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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"
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/pt_BR/LC_MESSAGES/quantum.po b/quantum/locale/pt_BR/LC_MESSAGES/quantum.po
index 227d3fa6efbeaf28594e38cc35e3fcd121b1c8cc..f3b05c612f0077a4115566e9a7e9fb95e8992b20 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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) "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/quantum.pot b/quantum/locale/quantum.pot
index 5111d6786d4aca777d22dd8fdeebb114adf9431b..5aefa252083a7a2f79fe1d0ad0d0c8afe07cae28 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.147\n"
+"jenkins.quantum.propose.translation.update.148\n"
 "Report-Msgid-Bugs-To: EMAIL@ADDRESS\n"
-"POT-Creation-Date: 2013-06-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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"
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""

diff --git a/quantum/locale/ro/LC_MESSAGES/quantum.po b/quantum/locale/ro/LC_MESSAGES/quantum.po
index 721193c114906ec36f9d785a712280043bc51c19..0f4eecce4ef61cf1f6bd88e022e6622f94d1dd38 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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 "
@@ -722,71 +722,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1531,41 +1527,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8652,3 +8648,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/ru/LC_MESSAGES/quantum.po b/quantum/locale/ru/LC_MESSAGES/quantum.po
index 3c75c2032f32a55c153e6e10169f99e2ec733408..ad07241170ca6970d9935d3a0055c00f39cc6f55 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 12:11+0000\n"
 "PO-Revision-Date: 2013-05-13 06:01+0000\n"
 "Last-Translator: openstackjenkins <jenkins@openstack.org>\n"
 "Language-Team: Russian "
@@ -722,71 +722,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1531,41 +1527,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8652,3 +8648,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/vi_VN/LC_MESSAGES/quantum.po b/quantum/locale/vi_VN/LC_MESSAGES/quantum.po
index 982ecb9fd0fee6fd2d19ce2b5eabb99898c363e5..212a3fac35c2375e607daf9c9adda8d61b76e4a9 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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) "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/zh_CN/LC_MESSAGES/quantum.po b/quantum/locale/zh_CN/LC_MESSAGES/quantum.po
index 94014b4dd59e2509e0abb61aaab3c2cdd6ee0d41..2b4427ebe8e8f5e4a48e1330a88dea28e20c1d77 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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) "
@@ -721,71 +721,67 @@ msgid "Location to store DHCP server config files"
 msgstr ""
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr ""
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr ""
@@ -1530,41 +1526,41 @@ msgstr ""
 msgid "Maximum number of fixed ips per port"
 msgstr ""
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr ""
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr ""
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr ""
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr ""
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr ""
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr ""
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr ""
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr ""
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr ""
@@ -8651,3 +8647,6 @@ msgstr ""
 msgid "lrouter:%s not found"
 msgstr ""
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr ""
+

diff --git a/quantum/locale/zh_TW/LC_MESSAGES/quantum.po b/quantum/locale/zh_TW/LC_MESSAGES/quantum.po
index 402720026dfbb8cdc44a7558bc4dcd9c91c5db14..de63ea42ac72c1c423ef0a2f906941809ef6c7fc 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-24 12:11+0000\n"
+"POT-Creation-Date: 2013-06-25 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) "
@@ -726,71 +726,67 @@ msgid "Location to store DHCP server config files"
 msgstr "DHCP 伺服器配置檔的儲存位置"
 
 #: quantum/agent/linux/dhcp.py:43
-msgid "Lifetime of a DHCP lease in seconds"
-msgstr "DHCP 租賃的生命期限（以秒為單位）"
-
-#: quantum/agent/linux/dhcp.py:46
 msgid "Domain to use for building the hostnames"
 msgstr "用於建置主機名稱的網域"
 
-#: quantum/agent/linux/dhcp.py:49
+#: quantum/agent/linux/dhcp.py:46
 msgid "Override the default dnsmasq settings with this file"
 msgstr "使用此檔案來置換預設 dnsmasq 設定"
 
-#: quantum/agent/linux/dhcp.py:51
+#: quantum/agent/linux/dhcp.py:48
 msgid "Use another DNS server before any in /etc/resolv.conf."
 msgstr "在 /etc/resolv.conf 中任何 DNS 伺服器之前使用另一個 DNS 伺服器。"
 
-#: quantum/agent/linux/dhcp.py:142
+#: quantum/agent/linux/dhcp.py:139
 #, python-format
 msgid "DHCP for %(net_id)s pid %(pid)d is stale, ignoring command"
 msgstr "%(net_id)s pid %(pid)d 的 DHCP 已過時，正在忽略指令"
 
-#: quantum/agent/linux/dhcp.py:145
+#: quantum/agent/linux/dhcp.py:142
 #, python-format
 msgid "No DHCP started for %s"
 msgstr "未給 %s 啟動 DHCP"
 
-#: quantum/agent/linux/dhcp.py:167 quantum/agent/linux/external_process.py:84
+#: quantum/agent/linux/dhcp.py:164 quantum/agent/linux/external_process.py:84
 #, python-format
 msgid "Error while reading %s"
 msgstr "讀取 %s 時發生錯誤"
 
-#: quantum/agent/linux/dhcp.py:174 quantum/agent/linux/external_process.py:92
+#: quantum/agent/linux/dhcp.py:171 quantum/agent/linux/external_process.py:92
 #, python-format
 msgid "Unable to convert value in %s"
 msgstr "無法轉換 %s 中的值"
 
-#: quantum/agent/linux/dhcp.py:176 quantum/agent/linux/external_process.py:90
+#: quantum/agent/linux/dhcp.py:173 quantum/agent/linux/external_process.py:90
 #, python-format
 msgid "Unable to access %s"
 msgstr "無法存取 %s"
 
-#: quantum/agent/linux/dhcp.py:236
+#: quantum/agent/linux/dhcp.py:233
 #, python-format
 msgid ""
 "FAILED VERSION REQUIREMENT FOR DNSMASQ. DHCP AGENT MAY NOT RUN CORRECTLY!"
 " Please ensure that its version is %s or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:241
+#: quantum/agent/linux/dhcp.py:238
 #, python-format
 msgid ""
 "Unable to determine dnsmasq version. Please ensure that its version is %s"
 " or above!"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:329
+#: quantum/agent/linux/dhcp.py:326
 #, python-format
 msgid "Killing dhcpmasq for network since all subnets have turned off DHCP: %s"
 msgstr "由於所有子網路都已關閉 DHCP，所以正在結束網路的 dhcpmasq：%s"
 
-#: quantum/agent/linux/dhcp.py:339
+#: quantum/agent/linux/dhcp.py:336
 #, python-format
 msgid "Pid %d is stale, relaunching dnsmasq"
 msgstr ""
 
-#: quantum/agent/linux/dhcp.py:340
+#: quantum/agent/linux/dhcp.py:337
 #, python-format
 msgid "Reloading allocations for network: %s"
 msgstr "正在重新載入網路的配置：%s"
@@ -1541,41 +1537,41 @@ msgstr "每個子網路的主機路徑數目上限"
 msgid "Maximum number of fixed ips per port"
 msgstr "每個埠的固定 IP 數目上限"
 
-#: quantum/common/config.py:74
+#: quantum/common/config.py:75
 msgid "DHCP lease duration"
 msgstr "DHCP 租賃期間"
 
-#: quantum/common/config.py:76
+#: quantum/common/config.py:77
 msgid "Allow sending resource operation notification to DHCP agent"
 msgstr "容許將資源作業通知傳送給 DHCP 代理程式"
 
-#: quantum/common/config.py:79
+#: quantum/common/config.py:80
 msgid "Allow overlapping IP support in Quantum"
 msgstr "容許 Quantum 中的重疊 IP 支援"
 
-#: quantum/common/config.py:81
+#: quantum/common/config.py:82
 msgid "The hostname Quantum is running on"
 msgstr "Quantum 正在其中執行的主機名稱"
 
-#: quantum/common/config.py:83
+#: quantum/common/config.py:84
 msgid "Ensure that configured gateway is on subnet"
 msgstr "請確保所配置的閘道位於子網路上"
 
-#: quantum/common/config.py:106
+#: quantum/common/config.py:107
 #, python-format
 msgid "Base MAC: %s"
 msgstr "基本 MAC：%s"
 
-#: quantum/common/config.py:117
+#: quantum/common/config.py:118
 msgid "Logging enabled!"
 msgstr "已啟用記載！"
 
-#: quantum/common/config.py:130
+#: quantum/common/config.py:131
 #, python-format
 msgid "Config paste file: %s"
 msgstr "配置貼上檔案：%s"
 
-#: quantum/common/config.py:135
+#: quantum/common/config.py:136
 #, python-format
 msgid "Unable to load %(app_name)s from configuration file %(config_path)s."
 msgstr "無法從配置檔 %(config_path)s 載入 %(app_name)s。"
@@ -8739,3 +8735,6 @@ msgstr "找不到 lswitch：%s"
 msgid "lrouter:%s not found"
 msgstr "找不到 lrouter：%s"
 
+#~ msgid "Lifetime of a DHCP lease in seconds"
+#~ msgstr "DHCP 租賃的生命期限（以秒為單位）"
+