Merge lp:~ubuntu-branches/ubuntu/oneiric/ltsp/oneiric-201108242108 into lp:ubuntu/oneiric/ltsp

[Ubuntu Package Importer]

The package importer has detected a possible inconsistency between the package history in the archve and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/oneiric/ltsp reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/oneiric/ltsp/oneiric-201108242108. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
  1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
  2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
  3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.

If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https://bugs.launchpad.net/udd linking to this merge proposal.

(this is an automatically generated message)

Unmerged revisions

242. By Stéphane Graber on 2011-08-24

releasing version 5.2.16-0ubuntu2

241. By Stéphane Graber on 2011-08-24

Update dependencies for new ltsp-live

240. By Stéphane Graber on 2011-08-24

Replace ltsp-live by new python equivalent

=== added file 'debian/scripts/ltsp-live'
--- debian/scripts/ltsp-live	1970-01-01 00:00:00 +0000
+++ debian/scripts/ltsp-live	2011-09-02 22:56:31 +0000
@@ -0,0 +1,301 @@
+#!/usr/bin/python
+# -*- coding: utf-8 -*-
+# Copyright (applies if no explicit header in the file):
+#
+# This program is free software; you can redistribute it and/or
+# modify it under the terms of the GNU General Public License
+# as published by the Free Software Foundation; either version 2
+# of the License, or (at your option) any later version.
+#
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.
+#
+# Copyright (C) 2011 Canonical Ltd.
+# Authors:
+#  * Stéphane Graber <[e-mail]>, 2011
+
+import os, gettext, sys, subprocess
+from gettext import gettext as _
+gettext.textdomain("ltsp-live")
+
+def generate_network(name, address):
+    import uuid
+
+    try:
+        from ConfigParser import ConfigParser
+    except:
+        from configparser import ConfigParser
+
+    parser = ConfigParser()
+    path = "/etc/NetworkManager/system-connections/%s" % name
+
+    if path not in parser.read(path):
+        if not os.path.exists(path):
+            print(_("Creating new configuration file"))
+        else:
+            print(_("Unable to parse config"))
+            sys.exit(1)
+
+    if "802-3-ethernet" not in parser.sections():
+        parser.add_section("802-3-ethernet")
+    parser.set("802-3-ethernet", "duplex", "full")
+
+    if "connection" not in parser.sections():
+        parser.add_section("connection")
+    parser.set("connection", "id", name)
+    parser.set("connection", "uuid", str(uuid.uuid4()))
+    parser.set("connection", "type", "802-3-ethernet")
+
+    if "ipv6" not in parser.sections():
+        parser.add_section("ipv6")
+    parser.set("ipv6", "method", "ignore")
+
+    if "ipv4" not in parser.sections():
+        parser.add_section("ipv4")
+    parser.set("ipv4", "method", "manual")
+    parser.set("ipv4", "addresses1", address)
+
+
+    config=open("%s.tmp" % path, "w+")
+    parser.write(config)
+    config.close()
+
+    os.chmod("%s.tmp" % path, 0o600)
+    os.rename("%s.tmp" % path, path)
+
+def enable_network(name, interface):
+    cmd=['nmcli', 'con', 'up', 'id', name, 'iface', interface]
+    enable=subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,env={'LANG':'C'})
+    retval=enable.wait()
+
+    if retval != 0:
+        print(_("Failed to enable LTSP: %s") % " ".join(cmd))
+        print(enable.stdout.read().strip())
+        print(enable.stderr.read().strip())
+
+    return retval
+
+def list_devices():
+    devices={}
+
+    cmd=['nmcli', '-e', 'yes', '-t', '-f', 'DEVICE,TYPE,STATE', 'dev']
+    listdev=subprocess.Popen(cmd,stdout=subprocess.PIPE,stderr=subprocess.PIPE,env={'LANG':'C'})
+    retval=listdev.wait()
+
+    if retval != 0:
+        print(_("Failed to list network cards: %s") % " ".join(cmd))
+        print(listdev.stdout.read().strip())
+        print(listdev.stderr.read().strip())
+    else:
+        for line in listdev.stdout.readlines():
+            fields=str(line).strip().split(':')
+            if len(fields) == 3:
+                if fields[1] != "802-3-ethernet" or fields[2] == "unavailable":
+                    continue
+                devices[fields[0]]=(fields[1],fields[2])
+
+    return devices
+
+def start_ltsplive(interface, winLTSP):
+    import time
+
+    # Add the network to Network Manager
+    generate_network("LTSP","192.168.0.254;24;0.0.0.0;")
+    time.sleep(2)
+
+    # Switch to that network now
+    if enable_network("LTSP",interface) != 0:
+        # Something went wrong
+        winLTSP.set_sensitive(True)
+        return False
+
+    # Install the needed packages
+    cmd=["apt-get", "install", "--no-install-recommends", "-qq", "-y", "ltsp-server", "openssh-server"]
+    runcmd=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    runcmd.wait()
+
+    # Kill inetd as it's not needed anyway
+    cmd=["killall","inetd"]
+    runcmd=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    runcmd.wait()
+
+    # Create LTSP configuration
+    os.makedirs("/var/lib/tftpboot/ltsp/i386", mode=0o755)
+    ltsconf=open("/var/lib/tftpboot/ltsp/i386/lts.conf","w+")
+    ltsconf.write("""
+[default]
+LDM_DIRECTX=True
+LDM_SSHOPTIONS="-o StrictHostKeyChecking=no -o CheckHostIP=no -o LogLevel=silent"
+LDM_GUESTLOGIN=True
+""")
+
+    # Edubuntu theming
+    if os.path.exists("/cdrom/README.diskdefines") and "Edubuntu" in open("/cdrom/README.diskdefines").read():
+        ltsconf.write("LDM_THEME=edubuntu\n")
+    ltsconf.close()
+
+    # Create LTSP Guest users
+    newusers=open("/tmp/userlist","w+")
+    for user in range(1,255):
+        newusers.write("ltsp%s:ltsp%s:%s:1000:LTSP Guest:/home/ltsp%s:/bin/sh\n" % (user, user, 2000+user, user))
+    newusers.close()
+
+    cmd=["newusers","/tmp/userlist"]
+    runcmd=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    runcmd.wait()
+
+    # Configuring dnsmasq
+    dnsmasq=open("/tmp/dnsmasq-ltsp-livecd.conf","w+")
+    dnsmasq.write("""
+pxe-prompt="Starting Edubuntu Live LTSP... Press F8 for boot menu.", 3
+pxe-service=X86PC, "Boot from network", /ltsp/i386/pxelinux
+pxe-service=X86PC, "Boot from local hard disk", 0
+enable-tftp
+tftp-root=/var/lib/tftpboot
+dhcp-boot=/ltsp/i386/pxelinux.0
+dhcp-option=vendor:PXEClient,6,2b
+dhcp-no-override
+dhcp-range=192.168.0.50,192.168.0.150,8h
+""")
+    dnsmasq.close()
+
+    # Call dnsmasq -C /tmp/dnsmasq-ltsp-livecd.conf
+    cmd=["dnsmasq", "-C", "/tmp/dnsmasq-ltsp-livecd.conf"]
+    runcmd=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    runcmd.wait()
+
+    # Set up kernels, etc:
+    os.makedirs("/opt/ltsp/i386",0o755)
+
+    cmd=["mount", "/cdrom/ltsp/i386.img", "/opt/ltsp/i386", "-o", "loop"]
+    runcmd=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    runcmd.wait()
+
+    cmd=["ltsp-update-kernels"]
+    runcmd=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    runcmd.wait()
+
+    cmd=["umount", "/opt/ltsp/i386"]
+    runcmd=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    runcmd.wait()
+
+    # Start nbd-server
+    cmd=["nbd-server", "2000", "/cdrom/ltsp/i386.img"]
+    runcmd=subprocess.Popen(cmd, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    runcmd.wait()
+
+    sys.exit(0)
+
+def start_ui():
+    from gi.repository import Gtk as gtk
+    from gi.repository import GObject as gobject
+
+    builder = gtk.Builder()
+    builder.set_translation_domain("ltsp-live")
+    if os.path.exists("ltsp-live.xml"):
+        xml_file = "ltsp-live.xml"
+    elif os.path.exists("/usr/share/ltsp-live/ltsp-live.xml"):
+        xml_file = "/usr/share/ltsp-live/ltsp-live.xml"
+    else:
+        print(_("Unable to find .xml UI file"))
+        sys.exit(1)
+
+    builder.add_from_file(xml_file)
+
+    winLTSP = builder.get_object("winLTSP")
+    cmbInterface = builder.get_object("cmbInterface")
+    btnStart = builder.get_object("btnStart")
+
+    # Populate drop-down
+    model_interface = gtk.ListStore(str,str)
+    cmbInterface.set_model(model_interface)
+    cell = gtk.CellRendererText()
+    cmbInterface.pack_start(cell, False)
+    cmbInterface.add_attribute(cell,'text',0)
+
+    entry_cache=[]
+    devices={}
+
+    def check_remove_entry(model, path, rowiter, data):
+        if model.get_value(rowiter, 1) == data:
+            model.remove(rowiter)
+            return True
+        return False
+
+    def update_interfaces():
+        if winLTSP.get_sensitive() == False:
+            return True
+
+        devices.clear()
+        devices.update(list_devices())
+
+        if len(devices) == 0:
+            if len(model_interface) == 1 and model_interface[0][1] == "None":
+                return True
+
+            for entry in entry_cache:
+                entry_cache.remove(entry)
+            model_interface.clear()
+            model_interface.append([_("None"),"None"])
+            cmbInterface.set_active(0)
+            cmbInterface.set_sensitive(False)
+            btnStart.set_sensitive(False)
+            return True
+
+        if len(entry_cache) == 0:
+            cmbInterface.set_sensitive(True)
+            btnStart.set_sensitive(True)
+            model_interface.clear()
+
+        # Add new entries
+        for device in devices:
+            entry=["%s (%s)" % (device, devices[device][0]),device]
+            if entry not in entry_cache:
+                model_interface.append(entry)
+                entry_cache.append(entry)
+
+        # Remove old entries
+        for entry in entry_cache:
+            if entry[1] not in devices:
+                model_interface.foreach(check_remove_entry,(entry[1]))
+                entry_cache.remove(entry)
+
+        cmbInterface.set_active(0)
+        return True
+
+    update_interfaces()
+    gobject.timeout_add(2000, update_interfaces)
+
+    def start(button):
+        interface = model_interface[cmbInterface.get_active()][1]
+        if devices[interface][1] == "connected":
+            warning=gtk.MessageDialog(
+                parent=winLTSP,
+                flags=gtk.DialogFlags.MODAL,
+                message_type=gtk.MessageType.WARNING,
+                buttons=gtk.ButtonsType.OK_CANCEL,
+                message_format=_("The selected network interface is already in use.\nAre you sure you want to use it?"))
+            retval = warning.run()
+            warning.destroy()
+            if retval != gtk.ResponseType.OK:
+                return
+
+        winLTSP.set_sensitive(False)
+        gobject.timeout_add(1000, start_ltsplive, interface, winLTSP)
+
+    builder.connect_signals({
+        "on_winLTSP_destroy" : gtk.main_quit,
+        "on_btnCancel_clicked" : gtk.main_quit,
+        "on_btnStart_clicked" : start,
+    })
+
+    winLTSP.show()
+    gtk.main()
+
+start_ui()

=== added file 'debian/scripts/ltsp-live.desktop'
--- debian/scripts/ltsp-live.desktop	1970-01-01 00:00:00 +0000
+++ debian/scripts/ltsp-live.desktop	2011-09-02 22:56:31 +0000
@@ -0,0 +1,7 @@
+
+[Desktop Entry]
+Icon=ltsp-live.png
+Type=Application
+Exec=gksudo ltsp-live
+Name=Start LTSP Live
+Comment=Starts an LTSP LiveCD Session

=== renamed file 'debian/scripts/ltsp-live.desktop' => 'debian/scripts/ltsp-live.desktop.moved'
=== renamed file 'debian/scripts/ltsp-live' => 'debian/scripts/ltsp-live.moved'
=== added file 'debian/scripts/ltsp-live.png.b64'
--- debian/scripts/ltsp-live.png.b64	1970-01-01 00:00:00 +0000
+++ debian/scripts/ltsp-live.png.b64	2011-09-02 22:56:31 +0000
@@ -0,0 +1,87 @@
+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

=== renamed file 'debian/scripts/ltsp-live.png.b64' => 'debian/scripts/ltsp-live.png.b64.moved'
=== added file 'debian/scripts/ltsp-live.xml'
--- debian/scripts/ltsp-live.xml	1970-01-01 00:00:00 +0000
+++ debian/scripts/ltsp-live.xml	2011-09-02 22:56:31 +0000
@@ -0,0 +1,115 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<interface>
+  <requires lib="gtk+" version="2.16"/>
+  <object class="GtkWindow" id="winLTSP">
+    <property name="can_focus">False</property>
+    <property name="title" translatable="yes">LTSP-Live configuration</property>
+    <property name="resizable">False</property>
+    <property name="window_position">center-always</property>
+    <signal name="destroy" handler="on_winLTSP_destroy" swapped="no"/>
+    <child>
+      <object class="GtkVBox" id="vbox1">
+        <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="border_width">12</property>
+        <property name="spacing">8</property>
+        <child>
+          <object class="GtkLabel" id="lblWarning">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="xalign">0</property>
+            <property name="label" translatable="yes">Welcome to LTSP Live.
+Please choose a network interface below and click OK.</property>
+            <property name="use_markup">True</property>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">0</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkBox" id="hbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">8</property>
+            <child>
+              <object class="GtkLabel" id="label1">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="xalign">0</property>
+                <property name="label" translatable="yes">Network devices</property>
+              </object>
+              <packing>
+                <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkComboBox" id="cmbInterface">
+                <property name="visible">True</property>
+                <property name="can_focus">False</property>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">True</property>
+            <property name="fill">True</property>
+            <property name="position">1</property>
+          </packing>
+        </child>
+        <child>
+          <object class="GtkHButtonBox" id="hbuttonbox1">
+            <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="spacing">6</property>
+            <property name="layout_style">end</property>
+            <child>
+              <object class="GtkButton" id="btnCancel">
+                <property name="label">gtk-cancel</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_btnCancel_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">0</property>
+              </packing>
+            </child>
+            <child>
+              <object class="GtkButton" id="btnStart">
+                <property name="label">gtk-ok</property>
+                <property name="visible">True</property>
+                <property name="can_focus">True</property>
+                <property name="receives_default">True</property>
+                <property name="use_action_appearance">False</property>
+                <property name="use_stock">True</property>
+                <signal name="clicked" handler="on_btnStart_clicked" swapped="no"/>
+              </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">False</property>
+                <property name="position">1</property>
+              </packing>
+            </child>
+          </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">False</property>
+            <property name="position">3</property>
+          </packing>
+        </child>
+      </object>
+    </child>
+  </object>
+</interface>

=== renamed file 'debian/scripts/ltsp-live.xml' => 'debian/scripts/ltsp-live.xml.moved'
=== added directory 'debian/scripts/po'
=== renamed directory 'debian/scripts/po' => 'debian/scripts/po.moved'
=== added file 'debian/scripts/po/Makefile'
--- debian/scripts/po/Makefile	1970-01-01 00:00:00 +0000
+++ debian/scripts/po/Makefile	2011-09-02 22:56:31 +0000
@@ -0,0 +1,35 @@
+DOMAIN=ltsp-live
+POFILES=$(wildcard *.po)
+MOFILES=$(patsubst %.po,%.mo,$(POFILES))
+LINGUAS=$(basename $(POFILES))
+POTFILE=$(DOMAIN).pot
+
+%.mo: %.po
+	msgfmt --statistics -o $@ $<
+
+%.po: $(DOMAIN).pot
+	msgmerge -U $*.po $(DOMAIN).pot
+
+$(DOMAIN).pot:
+	pygettext -d $(DOMAIN) -a -D ../ltsp-live
+	xgettext -L glade -o $(DOMAIN).pot -j ../ltsp-live.xml
+	sed "/#, fuzzy/d" -i ltsp-live.pot
+
+update-po:
+	-for lang in $(LINGUAS); do\
+	    msgmerge -U $$lang.po $(DOMAIN).pot; \
+	done
+
+install: $(MOFILES)
+	-for lang in $(LINGUAS); do\
+	    install -d $(DESTDIR)/usr/share/locale/$$lang/LC_MESSAGES/; \
+	    install -m 644 $$lang.mo $(DESTDIR)/usr/share/locale/$$lang/LC_MESSAGES/$(DOMAIN).mo; \
+	done
+
+all: update-po $(MOFILES)
+
+distclean: clean
+clean:
+	- rm *.mo *~
+
+.PHONY: update-po check

=== added file 'debian/scripts/po/fr.po'
--- debian/scripts/po/fr.po	1970-01-01 00:00:00 +0000
+++ debian/scripts/po/fr.po	2011-09-02 22:56:31 +0000
@@ -0,0 +1,65 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-24 16:45-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../ltsp-live:40
+msgid "Creating new configuration file"
+msgstr "Création d'un nouveau fichier de configuration"
+
+#: ../ltsp-live:42
+msgid "Unable to parse config"
+msgstr "Impossible d'analyser la configuration"
+
+#: ../ltsp-live:78
+msgid "Failed to enable LTSP: %s"
+msgstr "Impossible de configurer LTSP: %s"
+
+#: ../ltsp-live:92
+msgid "Failed to list network cards: %s"
+msgstr "Impossible de lister les cartes réseaux: %s"
+
+#: ../ltsp-live:205
+msgid "Unable to find .xml UI file"
+msgstr "Fichier .xml d'interface graphique introuvable"
+
+#: ../ltsp-live:244
+msgid "None"
+msgstr "Aucune"
+
+#: ../ltsp-live:282
+msgid ""
+"The selected network interface is already in use.\n"
+"Are you sure you want to use it?"
+msgstr ""
+"La carte réseau séléctionnée est déjà utilisée.\n"
+"Etes-vous sûr de vouloir l'utiliser?"
+
+#: ../ltsp-live.xml:6
+msgid "LTSP-Live configuration"
+msgstr "Configure de LTSP-Live"
+
+#: ../ltsp-live.xml:21
+msgid ""
+"Welcome to LTSP Live.\n"
+"Please choose a network interface below and click OK."
+msgstr ""
+"Bienvenue dans LTSP Live.\n"
+"Veuillez choisir une interface réseau et cliquer OK."
+
+#: ../ltsp-live.xml:41
+msgid "Network devices"
+msgstr "Carte réseaux"

=== added file 'debian/scripts/po/ltsp-live.pot'
--- debian/scripts/po/ltsp-live.pot	1970-01-01 00:00:00 +0000
+++ debian/scripts/po/ltsp-live.pot	2011-09-02 22:56:31 +0000
@@ -0,0 +1,61 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: PACKAGE VERSION\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2011-08-24 16:45-0400\n"
+"PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n"
+"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
+"Language-Team: LANGUAGE <[e-mail]>\n"
+"Language: \n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=CHARSET\n"
+"Content-Transfer-Encoding: 8bit\n"
+
+#: ../ltsp-live:40
+msgid "Creating new configuration file"
+msgstr ""
+
+#: ../ltsp-live:42
+msgid "Unable to parse config"
+msgstr ""
+
+#: ../ltsp-live:78
+msgid "Failed to enable LTSP: %s"
+msgstr ""
+
+#: ../ltsp-live:92
+msgid "Failed to list network cards: %s"
+msgstr ""
+
+#: ../ltsp-live:205
+msgid "Unable to find .xml UI file"
+msgstr ""
+
+#: ../ltsp-live:244
+msgid "None"
+msgstr ""
+
+#: ../ltsp-live:282
+msgid ""
+"The selected network interface is already in use.\n"
+"Are you sure you want to use it?"
+msgstr ""
+
+#: ../ltsp-live.xml:6
+msgid "LTSP-Live configuration"
+msgstr ""
+
+#: ../ltsp-live.xml:21
+msgid ""
+"Welcome to LTSP Live.\n"
+"Please choose a network interface below and click OK."
+msgstr ""
+
+#: ../ltsp-live.xml:41
+msgid "Network devices"
+msgstr ""