For SNAT, don't store the pre-fragment L2 header before actions are applied.

[sliver-openvswitch.git] / debian / po / templates.pot

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index 927eb09..443a1ce 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -8,7 +8,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: PACKAGE VERSION\n"
 "Report-Msgid-Bugs-To: openflow-dev@lists.stanford.edu\n"
-"POT-Creation-Date: 2008-06-12 14:45-0700\n"
+"POT-Creation-Date: 2008-10-31 10:13-0700\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"
@@ -18,19 +18,19 @@ msgstr ""
 
 #. Type: multiselect
 #. Choices
-#: ../openflow-switch.templates:1001
+#: ../openflow-switch-config.templates:1001
 msgid "${choices}"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../openflow-switch.templates:1002
+#: ../openflow-switch-config.templates:1002
 msgid "OpenFlow switch network devices:"
 msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../openflow-switch.templates:1002
+#: ../openflow-switch-config.templates:1002
 msgid ""
 "Choose the network devices that should become part of the OpenFlow switch.  "
 "At least two devices must be selected for this machine to be a useful "
@@ -40,7 +40,7 @@ msgstr ""
 
 #. Type: multiselect
 #. Description
-#: ../openflow-switch.templates:1002
+#: ../openflow-switch-config.templates:1002
 msgid ""
 "The network devices that you select should not be configured with IP or IPv6 "
 "addresses, even if the switch contacts the controller over one of the "
@@ -51,13 +51,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:2001
+#: ../openflow-switch-config.templates:2001
 msgid "No network devices were selected."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:2001
+#: ../openflow-switch-config.templates:2001
 msgid ""
 "No network devices were selected for inclusion in the OpenFlow switch. The "
 "switch will be disabled."
@@ -65,13 +65,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid "Some Network Devices Have IP or IPv6 Addresses"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid ""
 "The following network devices selected to be part of the OpenFlow switch "
 "have IP or IPv6 addresses configured:"
@@ -79,13 +79,13 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid "${configured-netdevs}"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid ""
 "This is usually a mistake, even if the switch contacts the controller over "
 "one of the selected network devices.  This is because a running OpenFlow "
@@ -95,7 +95,7 @@ msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:3001
+#: ../openflow-switch-config.templates:3001
 msgid ""
 "If this is an unintentional mistake, move back and fix the selection, or de-"
 "configure the IP or IPv6 from these network devices."
@@ -103,37 +103,46 @@ msgstr ""
 
 #. Type: select
 #. Choices
-#: ../openflow-switch.templates:4001
-msgid "in-band, out-of-band"
+#: ../openflow-switch-config.templates:4001
+msgid "discovery, in-band, out-of-band"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:4002
+#: ../openflow-switch-config.templates:4002
 msgid "Switch-to-controller access method:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:4002
+#: ../openflow-switch-config.templates:4002
 msgid ""
 "The OpenFlow switch must be able to contact the OpenFlow controller over the "
-"network.  It can do so in one of two ways:"
+"network.  It can do so in one of three ways:"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:4002
+#: ../openflow-switch-config.templates:4002
 msgid ""
-"in-band: A single network is used for OpenFlow traffic and other data "
+"discovery: A single network is used for OpenFlow traffic and other data "
 "traffic; that is, the switch contacts the controller over one of the network "
-"devices selected as OpenFlow switch netdevs in the previous question.  This "
-"is the most common case."
+"devices selected as OpenFlow switch network devices in the previous "
+"question.  The switch automatically determines the location of the "
+"controller using a DHCP request with an OpenFlow-specific vendor option.  "
+"This is the most common case."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:4002
+#: ../openflow-switch-config.templates:4002
+msgid ""
+"in-band: As above, but the location of the controller is manually configured."
+msgstr ""
+
+#. Type: select
+#. Description
+#: ../openflow-switch-config.templates:4002
 msgid ""
 "out-of-band: OpenFlow traffic uses a network separate from the data traffic "
 "that it controls.  If this is the case, the control network must already be "
@@ -141,15 +150,87 @@ msgid ""
 "OpenFlow switch netdev in the previous question."
 msgstr ""
 
+#. Type: note
+#. Description
+#: ../openflow-switch-config.templates:5001
+msgid "Preparing to discover controller."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../openflow-switch-config.templates:5001
+msgid ""
+"The setup program will now attempt to discover the OpenFlow controller. "
+"Controller discovery may take up to 30 seconds.  Please be patient."
+msgstr ""
+
+#. Type: note
+#. Description
+#: ../openflow-switch-config.templates:5001
+msgid ""
+"See secchan(8) for instructions on how to configure a DHCP server for "
+"controller discovery."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../openflow-switch-config.templates:6001
+msgid "Controller discovery failed."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../openflow-switch-config.templates:6001
+msgid "The controller's location could not be determined automatically."
+msgstr ""
+
+#. Type: error
+#. Description
+#: ../openflow-switch-config.templates:6001
+msgid ""
+"Ensure that the OpenFlow DHCP server is properly configured.  See secchan(8) "
+"for instructions on how to configure a DHCP server for controller discovery."
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../openflow-switch-config.templates:7001
+msgid "Use discovered settings?"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../openflow-switch-config.templates:7001
+msgid "Controller discovery obtained the following settings:"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../openflow-switch-config.templates:7001
+msgid "Controller location: ${controller-vconn}"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../openflow-switch-config.templates:7001
+msgid "PKI URL: ${pki-uri}"
+msgstr ""
+
+#. Type: boolean
+#. Description
+#: ../openflow-switch-config.templates:7001
+msgid "Please verify that these settings are correct."
+msgstr ""
+
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:5001
+#: ../openflow-switch-config.templates:8001
 msgid "Switch IP address:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:5001
+#: ../openflow-switch-config.templates:8001
 msgid ""
 "For in-band communication with the controller, the OpenFlow switch must be "
 "able to determine its own IP address.  Its IP address may be configured "
@@ -158,13 +239,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:5001
+#: ../openflow-switch-config.templates:8001
 msgid "For static configuration, specify the switch's IP address as a string."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:5001
+#: ../openflow-switch-config.templates:8001
 msgid ""
 "For dynamic configuration with DHCP (the most common case), specify \"dhcp"
 "\". Configuration with DHCP will only work reliably if the network topology "
@@ -174,13 +255,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:6001
+#: ../openflow-switch-config.templates:9001
 msgid "The switch IP address is invalid."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:6001
+#: ../openflow-switch-config.templates:9001
 msgid ""
 "The switch IP address must specified as \"dhcp\" or a valid IP address in "
 "dotted-octet form (e.g. \"1.2.3.4\")."
@@ -188,13 +269,13 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:7001
+#: ../openflow-switch-config.templates:10001
 msgid "Controller location:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:7001
+#: ../openflow-switch-config.templates:10001
 msgid ""
 "Specify how the OpenFlow switch should connect to the OpenFlow controller. "
 "The value should be in form \"ssl:HOST[:PORT]\" to connect to the controller "
@@ -204,13 +285,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:8001
+#: ../openflow-switch-config.templates:11001
 msgid "The controller location is invalid."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:8001
+#: ../openflow-switch-config.templates:11001
 msgid ""
 "The controller location must be specifed as \"ssl:HOST[:PORT]\" to connect "
 "to the controller over SSL (recommended for security) or \"tcp:HOST[:PORT]\" "
@@ -219,22 +300,30 @@ msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:9001
-msgid "OpenFlow PKI server host name:"
+#: ../openflow-switch-config.templates:12001
+msgid "OpenFlow PKI server host name or URL:"
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:9001
+#: ../openflow-switch-config.templates:12001
 msgid ""
-"Specify the host name or IP address of the server that hosts the OpenFlow "
-"public key infrastructure (PKI).  This is usually the same host as the "
-"OpenFlow controller."
+"Specify a URL to the OpenFlow public key infrastructure (PKI).  If a host "
+"name or IP address is specified in place of a URL, then http://<host>/"
+"openflow/pki/ will be used, where <host> is the specified host name or IP "
+"address."
+msgstr ""
+
+#. Type: string
+#. Description
+#: ../openflow-switch-config.templates:12001
+msgid ""
+"The OpenFlow PKI is usually on the same machine as the OpenFlow controller."
 msgstr ""
 
 #. Type: string
 #. Description
-#: ../openflow-switch.templates:9001
+#: ../openflow-switch-config.templates:12001
 msgid ""
 "The setup process will connect to the OpenFlow PKI server over HTTP, using "
 "the system's configured default HTTP proxy (if any)."
@@ -242,22 +331,22 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:10001
+#: ../openflow-switch-config.templates:13001
 msgid "The switch CA certificate could not be retrieved."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:10001
+#: ../openflow-switch-config.templates:13001
 msgid "Retrieval of ${url} failed, with the following status: \"${error}\"."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:10001
+#: ../openflow-switch-config.templates:13001
 msgid ""
-"Ensure that the OpenFlow PKI server is correctly configured and available on "
-"${pki-host}.  If the system is configured to use an HTTP proxy, also make "
+"Ensure that the OpenFlow PKI server is correctly configured and available at "
+"${pki-uri}.  If the system is configured to use an HTTP proxy, also make "
 "sure that the HTTP proxy is available and that the PKI server can be reached "
 "through it."
 msgstr ""
@@ -268,20 +357,21 @@ msgstr ""
 #. Choices
 #. Type: select
 #. Choices
-#: ../openflow-switch.templates:11001 ../openflow-switch.templates:12001
-#: ../openflow-switch.templates:14001
+#: ../openflow-switch-config.templates:14001
+#: ../openflow-switch-config.templates:15001
+#: ../openflow-switch-config.templates:17001
 msgid "yes, no"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:11002
+#: ../openflow-switch-config.templates:14002
 msgid "Is ${fingerprint} the controller CA's fingerprint?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:11002
+#: ../openflow-switch-config.templates:14002
 msgid ""
 "If a man-in-the-middle attack is possible in your network environment, check "
 "that the controller CA's fingerprint is really ${fingerprint}.  Answer \"yes"
@@ -290,7 +380,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:11002
+#: ../openflow-switch-config.templates:14002
 msgid ""
 "If a man-in-the-middle attack is not a concern, there is no need to verify "
 "the fingerprint.  Simply answer \"yes\"."
@@ -298,13 +388,13 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:12002
+#: ../openflow-switch-config.templates:15002
 msgid "Send certificate request to switch CA?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:12002
+#: ../openflow-switch-config.templates:15002
 msgid ""
 "Before it can connect to the controller over SSL, the OpenFlow switch's key "
 "must be signed by the switch certificate authority (CA) located on the "
@@ -314,7 +404,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:12002
+#: ../openflow-switch-config.templates:15002
 msgid ""
 "Answer \"yes\" to send a signing request to the switch CA now.  This is "
 "ordinarily the correct choice.  There is no harm in sending a given signing "
@@ -323,7 +413,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:12002
+#: ../openflow-switch-config.templates:15002
 msgid ""
 "Answer \"no\" to skip sending a signing request to the switch CA. Unless the "
 "request has already been sent to the switch CA, manual sending of the "
@@ -332,33 +422,33 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:13001
+#: ../openflow-switch-config.templates:16001
 msgid "The certificate request could not be sent."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:13001
+#: ../openflow-switch-config.templates:16001
 msgid "Posting to ${url} failed, with the following status: \"${error}\"."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:13001
+#: ../openflow-switch-config.templates:16001
 msgid ""
-"Ensure that the OpenFlow PKI server is correctly configured and available on "
-"${pki-host}."
+"Ensure that the OpenFlow PKI server is correctly configured and available at "
+"${pki-uri}."
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:14002
+#: ../openflow-switch-config.templates:17002
 msgid "Fetch signed switch certificate from PKI server?"
 msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:14002
+#: ../openflow-switch-config.templates:17002
 msgid ""
 "Before it can connect to the controller over SSL, the OpenFlow switch's key "
 "must be signed by the switch certificate authority (CA) located on the "
@@ -368,7 +458,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:14002
+#: ../openflow-switch-config.templates:17002
 msgid ""
 "At this point, a signing request has been sent to the switch CA (or sending "
 "a request has been manually skipped), but the signed certificate has not yet "
@@ -378,7 +468,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:14002
+#: ../openflow-switch-config.templates:17002
 msgid ""
 "Answer \"yes\" to attempt to retrieve the signed switch certificate from the "
 "switch CA.  If the switch certificate request has been signed at the PKI "
@@ -387,7 +477,7 @@ msgstr ""
 
 #. Type: select
 #. Description
-#: ../openflow-switch.templates:14002
+#: ../openflow-switch-config.templates:17002
 msgid ""
 "Answer \"no\" to postpone switch configuration.  The configuration process "
 "must be restarted later, when the switch certificate request has been signed."
@@ -395,13 +485,13 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:15001
+#: ../openflow-switch-config.templates:18001
 msgid "Signed switch certificate could not be retrieved."
 msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:15001
+#: ../openflow-switch-config.templates:18001
 msgid ""
 "The signed switch certificate could not be retrieved from the switch CA: "
 "retrieval of ${url} failed, with the following status: \"${error}\"."
@@ -409,23 +499,23 @@ msgstr ""
 
 #. Type: error
 #. Description
-#: ../openflow-switch.templates:15001
+#: ../openflow-switch-config.templates:18001
 msgid ""
 "This probably indicates that the switch's certificate request has not yet "
 "been signed.  If this is the problem, it may be fixed by signing the "
-"certificate request at ${pki-host}, then trying to fetch the signed switch "
+"certificate request at ${pki-uri}, then trying to fetch the signed switch "
 "certificate again."
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:16001
+#: ../openflow-switch-config.templates:19001
 msgid "OpenFlow Switch Setup Finished"
 msgstr ""
 
 #. Type: note
 #. Description
-#: ../openflow-switch.templates:16001
+#: ../openflow-switch-config.templates:19001
 msgid ""
 "Setup of this OpenFlow switch is finished.  Complete the setup procedure to "
 "enable the switch."