diff -Nru ltsp-5.18.04/client/Debian/etc/ltsp/update-kernels.conf ltsp-5.18.12/client/Debian/etc/ltsp/update-kernels.conf --- ltsp-5.18.04/client/Debian/etc/ltsp/update-kernels.conf 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/Debian/etc/ltsp/update-kernels.conf 2018-12-25 01:13:20.000000000 +0000 @@ -48,10 +48,8 @@ # Preferred default kernel order #LIST_KERNELS_DEFAULT="486-custom 686-custom" -# Use pxelinux/syslinux's IPAPPEND parameter to add useful networking and -# other system information to the boot commandline: -# 1: Add networking: ip=::: -# 2: Add BOOTIF= -# 3: both 1 & 2 -# 4: Add SYSUUID= -#IPAPPEND=3 +# https://www.syslinux.org/wiki/index.php?title=SYSLINUX#SYSAPPEND_bitmask +# IPAPPEND defaults to 3 for clients to boot in ProxyDHCP mode. +# The downside is that they don't receive DHCP information like DNS, NTP etc. +# If you have a properly configured DHCP server, switch to IPAPPEND=2. +#IPAPPEND=2 diff -Nru ltsp-5.18.04/client/Debian/share/initramfs-tools/scripts/init-bottom/ltsp ltsp-5.18.12/client/Debian/share/initramfs-tools/scripts/init-bottom/ltsp --- ltsp-5.18.04/client/Debian/share/initramfs-tools/scripts/init-bottom/ltsp 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/Debian/share/initramfs-tools/scripts/init-bottom/ltsp 2018-12-25 01:13:20.000000000 +0000 @@ -26,34 +26,31 @@ [ -d "${rootmnt}/proc" ] || panic "rootmnt not mounted in init-bottom" # mount writeable filesystems if / is not already mounted writeable. if ! chroot ${rootmnt} /usr/bin/test -w "/" ; then - mkdir -p /rofs /cow - mount -t tmpfs -o mode=0755 tmpfs /cow + # systemd/mount.c guarantees that /run/initramfs/* mounts persist + mkdir -p /run/initramfs/rofs /run/initramfs/cow + mount -t tmpfs -o mode=0755 tmpfs /run/initramfs/cow if [ "$LTSP_NBD_TO_RAM" = "true" ]; then umount ${rootmnt} - dd if=/dev/nbd0 of=/cow/.rofsimage.img bs=1024k + dd if=/dev/nbd0 of=/run/initramfs/cow/.rofsimage.img bs=1024k nbd-client -d /dev/nbd0 - mount -o loop /cow/.rofsimage.img /rofs + mount -o loop /run/initramfs/cow/.rofsimage.img /run/initramfs/rofs else - mount -o move ${rootmnt} /rofs + mount -o move ${rootmnt} /run/initramfs/rofs fi if modprobe overlay; then UNION_TYPE=overlay - UNION_OPTS="upperdir=/cow/up,lowerdir=/rofs,workdir=/cow/work" - mkdir -p /cow/up /cow/work + UNION_OPTS="upperdir=/run/initramfs/cow/up,lowerdir=/run/initramfs/rofs,workdir=/run/initramfs/cow/work" + mkdir -p /run/initramfs/cow/up /run/initramfs/cow/work elif modprobe overlayfs; then UNION_TYPE=overlayfs - UNION_OPTS="upperdir=/cow,lowerdir=/rofs" + UNION_OPTS="upperdir=/run/initramfs/cow,lowerdir=/run/initramfs/rofs" elif modprobe aufs; then UNION_TYPE=aufs - UNION_OPTS="dirs=/cow=rw:/rofs=ro" + UNION_OPTS="dirs=/run/initramfs/cow=rw:/run/initramfs/rofs=ro" else panic "Could not load neither overlayfs nor aufs." fi mount -t ${UNION_TYPE} -o ${UNION_OPTS} ${UNION_TYPE} ${rootmnt} - for dir in /rofs /cow ; do - mkdir -p ${rootmnt}${dir} - mount -o move ${dir} ${rootmnt}${dir} - done fi # Copy networking configuration to the root file system diff -Nru ltsp-5.18.04/client/Debian/share/ltsp/init-ltsp.d/50-disable-cronjobs ltsp-5.18.12/client/Debian/share/ltsp/init-ltsp.d/50-disable-cronjobs --- ltsp-5.18.04/client/Debian/share/ltsp/init-ltsp.d/50-disable-cronjobs 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/Debian/share/ltsp/init-ltsp.d/50-disable-cronjobs 2018-12-25 01:13:20.000000000 +0000 @@ -4,9 +4,11 @@ while read job; do rm -f "$job" done < name mapper +auth-rpcgss-module # Kernel Module supporting RPCSEC_GSS nfs-blkmap # pNFS block layout mapping daemon -nfs-kernel-server # Kernel NFS server support +nfs-common # nfs-config.service # Preprocess NFS configuration +nfs-idmapd # NFSv4 ID-name mapping service +nfs-kernel-server # NFS server and services nfs-mountd # NFS Mount Daemon nfs-server # NFS server and services nfs-utils # NFS server and client services -portmap # RPC portmapper replacement +portmap # RPC bind portmap service +rpcbind # RPC bind portmap service +rpc-gssd # RPC security service for NFS client and server +rpc-statd-notify # Notify NFS peers of a restart +rpc-statd # NFS status monitor for NFSv2/3 locking. rpc-svcgssd # RPC security service for NFS server -rpcbind # RPC portmapper replacement -rpcbind-boot # RPC portmapper replacement -run-rpc_pipefs # RPC Pipe File System -statd # NSM status monitor ")" fi +# Minimize `systemctl disable` errors to not alarm the users +existing_services="" for service in $rm_services; do - rm -f /etc/rc?.d/???"$service" "/etc/init.d/$service" "/etc/init/$service.conf" "/lib/systemd/system/$service."* "/etc/systemd/system/$service."* + if [ -f "/lib/systemd/system/$service" ] || + [ -f "/lib/systemd/system/$service.service" ] || + [ -f "/etc/systemd/system/$service" ] || + [ -f "/etc/systemd/system/$service.service" ] || + [ -f "/etc/init.d/$service" ] + then + existing_services="$existing_services $service" + fi done +systemctl disable --quiet --root=/ --no-reload $existing_services + +# `systemctl disable display-manager` doesn't remove the alias in 237-3ubuntu10.2 +if echo " $rm_services " | grep -q " display-manager "; then + rm -f /etc/systemd/system/display-manager.service +fi diff -Nru ltsp-5.18.04/client/Fedora/initscripts/ltsp-client-launch ltsp-5.18.12/client/Fedora/initscripts/ltsp-client-launch --- ltsp-5.18.04/client/Fedora/initscripts/ltsp-client-launch 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/Fedora/initscripts/ltsp-client-launch 2018-12-25 01:13:20.000000000 +0000 @@ -32,7 +32,7 @@ # (TODO: This is duplicated from ltsp_config because we don't want to run that entire script at this point.) # check for NBD devices -NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/rofs /{print $1}' /proc/mounts) +NBD_DEVICES=$(awk '/^\/dev\/nbd.* \/ /||/^\/dev\/nbd.* \/run/initramfs/rofs /{print $1}' /proc/mounts) if [ -n "$NBD_DEVICES" ]; then for DEVICE in $NBD_DEVICES ; do SERVER=$(pgrep -f -l $DEVICE | awk '{print $3}') diff -Nru ltsp-5.18.04/client/initscripts/ltsp-core ltsp-5.18.12/client/initscripts/ltsp-core --- ltsp-5.18.04/client/initscripts/ltsp-core 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/initscripts/ltsp-core 2018-12-25 01:13:20.000000000 +0000 @@ -48,17 +48,13 @@ /bin/plymouth quit --retain-splash || true fi + start_printers || true start_screen_sessions || true start_sound || true log_action_end_msg 0 ;; stop) - # This means that an LTSP client is shutting down or rebooting. - # Try to cleanly close any open network connections. - if [ -x /usr/share/ltsp/nbd-disconnect ]; then - /usr/share/ltsp/nbd-disconnect & - fi ;; restart|force-reload) echo "$NAME does not support restarting, reboot your client instead." >&2 diff -Nru ltsp-5.18.04/client/initscripts/ltsp-init-common ltsp-5.18.12/client/initscripts/ltsp-init-common --- ltsp-5.18.04/client/initscripts/ltsp-init-common 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/initscripts/ltsp-init-common 2018-12-25 01:13:20.000000000 +0000 @@ -8,6 +8,33 @@ logger -p user.warning -t ltsp-client "warning: $msg" } +start_printers() { + for I in 0 1 2; do + eval PRINTER_DEVICE=\$\{PRINTER_${I}_DEVICE\} + if [ -n "${PRINTER_DEVICE}" ]; then + eval PORT=\$\{PRINTER_${I}_PORT:="910${I}"\} + eval BAUD=\$\{PRINTER_${I}_SPEED:-"9600"\} + eval SIZE=\$\{PRINTER_${I}_DATABITS:-"8"\} + eval PARITY=\$\{PRINTER_${I}_PARITY:-"none"\} + eval FLOW=\$\{PRINTER_${I}_FLOWCTRL:-"soft"\} + + JETPIPE_ARGS= + [ -n "$BAUD" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -b ${BAUD}" + [ -n "$SIZE" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -y ${SIZE}" + [ -n "$PARITY" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -p ${PARITY}" + if [ -n "$FLOW" ]; then + if [ "$FLOW" = "soft" ]; then + JETPIPE_ARGS="${JETPIPE_ARGS} -x" + else + JETPIPE_ARGS="${JETPIPE_ARGS} -r" + fi + fi + + /usr/sbin/jetpipe ${JETPIPE_ARGS} ${PRINTER_DEVICE} ${PORT} + fi + done +} + start_sound() { if boolean_is_true "$SOUND" ; then case "$SOUND_DAEMON" in diff -Nru ltsp-5.18.04/client/localapps/ldm-rc.d/X01-localapps ltsp-5.18.12/client/localapps/ldm-rc.d/X01-localapps --- ltsp-5.18.04/client/localapps/ldm-rc.d/X01-localapps 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/localapps/ldm-rc.d/X01-localapps 2018-12-25 01:13:20.000000000 +0000 @@ -33,7 +33,7 @@ done # Get user information from the server -IFS=':' read LDM_USERNAME dummy pw_uid pw_gid pw_gecos LDM_HOME pw_shell <::: -# 2: Add BOOTIF= -# 3: both 1 & 2 -# 4: Add SYSUUID= -#IPAPPEND=3 +# https://www.syslinux.org/wiki/index.php?title=SYSLINUX#SYSAPPEND_bitmask +# IPAPPEND defaults to 3 for clients to boot in ProxyDHCP mode. +# The downside is that they don't receive DHCP information like DNS, NTP etc. +# If you have a properly configured DHCP server, switch to IPAPPEND=2. +#IPAPPEND=2 diff -Nru ltsp-5.18.04/client/Redhat/initscripts/ltsp-core ltsp-5.18.12/client/Redhat/initscripts/ltsp-core --- ltsp-5.18.04/client/Redhat/initscripts/ltsp-core 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/Redhat/initscripts/ltsp-core 2018-12-25 01:13:20.000000000 +0000 @@ -53,11 +53,6 @@ ;; stop) - # This means that an LTSP client is shutting down or rebooting. - # Try to cleanly close any open network connections. - if [ -x /usr/share/ltsp/nbd-disconnect ]; then - /usr/share/ltsp/nbd-disconnect & - fi ;; restart|force-reload) echo "$NAME does not support restarting, reboot your client instead." >&2 diff -Nru ltsp-5.18.04/client/share/ltsp/cleanup.d/50-resolv-conf ltsp-5.18.12/client/share/ltsp/cleanup.d/50-resolv-conf --- ltsp-5.18.04/client/share/ltsp/cleanup.d/50-resolv-conf 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/cleanup.d/50-resolv-conf 2018-12-25 01:13:20.000000000 +0000 @@ -0,0 +1,6 @@ +# Restore possible changes of `ltsp-config dnsmasq --enable-dns` + +if [ -f /etc/systemd/resolved.conf.d/ltsp.conf ]; then + rm -f /etc/systemd/resolved.conf.d/ltsp.conf + ln -sf ../run/systemd/resolve/stub-resolv.conf /etc/resolv.conf +fi diff -Nru ltsp-5.18.04/client/share/ltsp/cleanup.d/50-var-log ltsp-5.18.12/client/share/ltsp/cleanup.d/50-var-log --- ltsp-5.18.04/client/share/ltsp/cleanup.d/50-var-log 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/cleanup.d/50-var-log 2018-12-25 01:13:20.000000000 +0000 @@ -2,4 +2,5 @@ find /var/log/ -type f -name '*.old' -o -name '*.1' -o -name '*.gz' -delete # Empty the rest. But avoid using `truncate` on overlayfs (LP: #1494660). -find /var/log/ -type f -exec tee {} + > /run/ltsp/ltsp_config diff -Nru ltsp-5.18.04/client/share/ltsp/init-ltsp.d/09-hostname ltsp-5.18.12/client/share/ltsp/init-ltsp.d/09-hostname --- ltsp-5.18.04/client/share/ltsp/init-ltsp.d/09-hostname 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/init-ltsp.d/09-hostname 2018-12-25 01:13:20.000000000 +0000 @@ -8,7 +8,7 @@ ip|"") HOSTNAME_EXTRA=$(ip -oneline -family inet address show dev $DEVICE | sed 's/.* \([0-9.]*\)\/\([0-9]*\) .*/\1.\2/' | - awk -F "." '{ print (2**24*$1+2**16*$2+2**8*$3+$4)%(2**(32-$5)) }') + awk -F "." '{ print (2^24*$1+2^16*$2+2^8*$3+$4)%(2^(32-$5)) }') ;; esac HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA" diff -Nru ltsp-5.18.04/client/share/ltsp/init-ltsp.d/10-resolv-conf ltsp-5.18.12/client/share/ltsp/init-ltsp.d/10-resolv-conf --- ltsp-5.18.04/client/share/ltsp/init-ltsp.d/10-resolv-conf 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/init-ltsp.d/10-resolv-conf 2018-12-25 01:13:20.000000000 +0000 @@ -4,16 +4,17 @@ # ignore nameserver of 0.0.0.0, which ipconfig may return if both # nameservers aren't specified. if [ "$dns" != "0.0.0.0" ]; then - DNS_SERVER="$DNS_SERVER $dns" + DNS_SERVER="${DNS_SERVER+$DNS_SERVER }$dns" fi done fi # If no DNS_SERVER was defined in lts.conf or in DHCP (e.g. IPAPPEND=3), -# check the LTSP server, gateway, and Google Public DNS. +# check if the LTSP server or the gateway are DNS servers. if [ -z "$DNS_SERVER" ] && [ -x /usr/bin/dig ]; then gateway=$(LANG=C ip route | sed -n 's/default via \([0-9.]*\).*/\1/p') - for dns in $SERVER $gateway 8.8.8.8; do + test "$gateway" != "$SERVER" || unset gateway + for dns in $SERVER $gateway; do if dig +time=1 +tries=1 +short "@$dns" localhost >/dev/null 2>&1; then DNS_SERVER="$dns" break @@ -21,30 +22,59 @@ done fi +# If klibc ipconfig is available, do a "fake" DHCP request to get the DNS +if [ -z "$DNS_SERVER" ] && [ -x /usr/lib/klibc/bin/ipconfig ]; then + # Remember non empty settings and append them after the new ones + existing_contents=$(grep -sv "=''$" /run/net-$DEVICE.conf) + if /usr/lib/klibc/bin/ipconfig -t 3 -n "$DEVICE" >/dev/null && + [ -f "/run/net-$DEVICE.conf" ] + then + if [ -n "$existing_contents" ]; then + echo "$existing_contents" >> "/run/net-$DEVICE.conf" + fi + # Don't blindly source it now, we might have changed some vars + for dns in $(. "/run/net-$DEVICE.conf" && echo $IPV4DNS0 $IPV4DNS1); do + if [ "$dns" != "0.0.0.0" ]; then + DNS_SERVER="${DNS_SERVER+$DNS_SERVER }$dns" + fi + done + fi +fi + if [ -z "$SEARCH_DOMAIN" ] && [ -n "$DNSDOMAIN" ]; then SEARCH_DOMAIN="$DNSDOMAIN" fi -# Apply the dns info that was received from dhcp or from lts.conf -if [ -n "$DNS_SERVER" ] || [ -n "$SEARCH_DOMAIN" ]; then +# Exit if we don't have anything to apply +test -n "$DNS_SERVER$SEARCH_DOMAIN" || return 0 + +# Deal with systemd-resolved. +# The symlink may be relative or absolute, so better use grep. +if ls -l /etc/resolv.conf | grep -q /run/systemd/resolve/; then + # We can't do per link DNS without systemd-networkd + # (e.g. when using network-manager), so define them globally + mkdir -p /etc/systemd/resolved.conf.d + { + echo "[Resolve]" + test -n "$DNS_SERVER" && echo "DNS=$DNS_SERVER" + test -n "$SEARCH_DOMAIN" && echo "Domains=$SEARCH_DOMAIN" + } > /etc/systemd/resolved.conf.d/ltsp.conf +else # Deal with resolvconf if [ -x /sbin/resolvconf ] && ( [ -L /etc/resolv.conf ] || [ -e /var/lib/resolvconf/convert ] ); then mkdir -p /etc/resolvconf/resolv.conf.d/ - resolv_method=resolvconf resolv=/etc/resolvconf/resolv.conf.d/base else - resolv_method=static resolv=/etc/resolv.conf + # Remove possibly dangling symlinks + rm -f "$resolv" fi - # Check if $resolv is writable - if echo '# Generated by ltsp' 2>/dev/null > "$resolv"; then - if [ -n "$SEARCH_DOMAIN" ]; then - echo "search $SEARCH_DOMAIN" >> "$resolv" - fi + { + echo "# Generated by LTSP" + test -n "$SEARCH_DOMAIN" && echo "search $SEARCH_DOMAIN" for n in $DNS_SERVER; do - echo "nameserver $n" >> "$resolv" + echo "nameserver $n" done - fi + } > "$resolv" fi -true diff -Nru ltsp-5.18.04/client/share/ltsp/init-ltsp.d/50-jetpipe ltsp-5.18.12/client/share/ltsp/init-ltsp.d/50-jetpipe --- ltsp-5.18.04/client/share/ltsp/init-ltsp.d/50-jetpipe 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/init-ltsp.d/50-jetpipe 1970-01-01 00:00:00.000000000 +0000 @@ -1,24 +0,0 @@ -for I in 0 1 2; do - eval PRINTER_DEVICE=\$\{PRINTER_${I}_DEVICE\} - if [ -n "${PRINTER_DEVICE}" ]; then - eval PORT=\$\{PRINTER_${I}_PORT:="910${I}"\} - eval BAUD=\$\{PRINTER_${I}_SPEED:-"9600"\} - eval SIZE=\$\{PRINTER_${I}_DATABITS:-"8"\} - eval PARITY=\$\{PRINTER_${I}_PARITY:-"none"\} - eval FLOW=\$\{PRINTER_${I}_FLOWCTRL:-"soft"\} - - JETPIPE_ARGS= - [ -n "$BAUD" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -b ${BAUD}" - [ -n "$SIZE" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -y ${SIZE}" - [ -n "$PARITY" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -p ${PARITY}" - if [ -n "$FLOW" ]; then - if [ "$FLOW" = "soft" ]; then - JETPIPE_ARGS="${JETPIPE_ARGS} -x" - else - JETPIPE_ARGS="${JETPIPE_ARGS} -r" - fi - fi - - /usr/sbin/jetpipe ${JETPIPE_ARGS} ${PRINTER_DEVICE} ${PORT} & - fi -done diff -Nru ltsp-5.18.04/client/share/ltsp/init-ltsp.d/50-logind-conf ltsp-5.18.12/client/share/ltsp/init-ltsp.d/50-logind-conf --- ltsp-5.18.04/client/share/ltsp/init-ltsp.d/50-logind-conf 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/init-ltsp.d/50-logind-conf 2018-12-25 01:13:20.000000000 +0000 @@ -0,0 +1,8 @@ +# Handle configuration in /etc/systemd/logind.conf +test -d /etc/systemd || return 0 + +if grep -qs '^\[Login\]' /etc/systemd/logind.conf; then + sed 's/^\[Login\]/&\nNAutoVTs=1\nReserveVT=1/' -i /etc/systemd/logind.conf +else + echo '[Login]\nNAutoVTs=1\nReserveVT=1' >> /etc/systemd/logind.conf +fi diff -Nru ltsp-5.18.04/client/share/ltsp/init-ltsp.d/50-rcfiles ltsp-5.18.12/client/share/ltsp/init-ltsp.d/50-rcfiles --- ltsp-5.18.04/client/share/ltsp/init-ltsp.d/50-rcfiles 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/init-ltsp.d/50-rcfiles 2018-12-25 01:13:20.000000000 +0000 @@ -1,4 +1,13 @@ -# Sample rc.local may end with "exit 0", remove it if it's in the last line -[ -f /etc/rc.local ] && sed '${/^exit 0$/d;}' -i /etc/rc.local +rcfiles=$(env | sort -V | sed -n 's/^RCFILE_[^=]*=//p') +test -n "$rcfiles" || return 0 -env | sort -V | sed -n 's/^RCFILE_[^=]*=//p' >> /etc/rc.local +if [ -x /etc/rc.local ]; then + # Some older rc.local samples ended with "exit 0", remove it + sed '${/^exit 0$/d;}' -i /etc/rc.local +else + # In recent distributions, it's not shipped at all + printf '#!/bin/sh\n\n' > /etc/rc.local + chmod +x /etc/rc.local +fi + +printf "%s\n" "$rcfiles" >> /etc/rc.local diff -Nru ltsp-5.18.04/client/share/ltsp/init-ltsp.d/50-systemd-shutdown ltsp-5.18.12/client/share/ltsp/init-ltsp.d/50-systemd-shutdown --- ltsp-5.18.04/client/share/ltsp/init-ltsp.d/50-systemd-shutdown 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/init-ltsp.d/50-systemd-shutdown 2018-12-25 01:13:20.000000000 +0000 @@ -0,0 +1,28 @@ +# Only run under systemd +test -x /lib/systemd/systemd-shutdown || return 0 + +# Overwrite systemd-shutdown with our own +cat > /lib/systemd/systemd-shutdown </dev/console + +# Verbs from systemd/shutdown.c +case "\$1" in + reboot) command="reboot -f" ;; + poweroff) command="poweroff -f" ;; + halt) command="halt -f" ;; + *) echo "Unknown option: \$0 \$1" >&2; exit 1 ;; +esac +sync +# Kill all user processes, including ssh sockets +pkill --inverse --uid 0 +swapoff -a +# Cache the command before disconnecting nbd +\$command --help >/dev/null 2>&1 +for nbd in \$(awk '/nbd/ { print \$NF }' < /proc/partitions | sort -rV); do + nbd-client -d "/dev/\$nbd" +done +\$command +EOF diff -Nru ltsp-5.18.04/client/share/ltsp/ltsp_config.d/50-host-to-username ltsp-5.18.12/client/share/ltsp/ltsp_config.d/50-host-to-username --- ltsp-5.18.04/client/share/ltsp/ltsp_config.d/50-host-to-username 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/ltsp_config.d/50-host-to-username 2018-12-25 01:13:20.000000000 +0000 @@ -0,0 +1,18 @@ +# Provide a way to map HOSTNAME to LDM_USERNAME (LP: #1781774). +# For example, HOST_TO_USERNAME="pc/guest" in lts.conf, would allow "pc01" +# to autologin with LDM_USERNAME="guest01" without specify it in lts.conf. + +test -n "$HOST_TO_USERNAME" || return 0 + +if [ -z "$HOSTNAME" ]; then + # Disable LDM_GUESTLOGIN and LDM_AUTOLOGIN on unknown clients. + test -n "$LDM_AUTOLOGIN" && set_lts_var LDM_AUTOLOGIN "" + test -n "$LDM_GUESTLOGIN" && set_lts_var LDM_GUESTLOGIN "" +elif [ -z "$LDM_USERNAME" ]; then + case "$HOSTNAME" in + "${HOST_TO_USERNAME%/*}"[0-9]*) + set_lts_var LDM_USERNAME "$(echo "$HOSTNAME" | sed "s/$HOST_TO_USERNAME/")" + test -z "$LDM_PASSWORD" && set_lts_var LDM_PASSWORD "$LDM_USERNAME" + ;; + esac +fi diff -Nru ltsp-5.18.04/client/share/ltsp/nbd-disconnect ltsp-5.18.12/client/share/ltsp/nbd-disconnect --- ltsp-5.18.04/client/share/ltsp/nbd-disconnect 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/nbd-disconnect 1970-01-01 00:00:00.000000000 +0000 @@ -1,72 +0,0 @@ -#!/bin/sh -# Tries to work around LP bug #696454, i.e. that if the root /dev/nbd0 device -# is unmounted on shutdown then nbd read errors occur, and if it isn't, then -# the nbd-server process on the server doesn't terminate. -# Called by init scripts on reboot or shutdown. - -case "$RUNLEVEL" in - 0) - key="o" - command="poweroff -f" - ;; - 6) - key="b" - command="reboot" - ;; - *) - echo "nbd-disconnect should only be called by initscripts on reboot/shutdown." >&2 - exit 1 - ;; -esac - -disconnect() { - # Stop trapping - trap - 0 HUP INT QUIT KILL SEGV PIPE TERM - - # ltsp-client-core.upstart needs "console output" to show stderr - echo "nbd-disconnect executing: $command" >&2 - # Cache the command in order to use it after nbd-client disconnects - $command --version >/dev/null 2>&1 - nbd-client -d "$root" - $command - # Hopefully this should never be reached - echo "$key" > /proc/sysrq-trigger -} - -# Disconnect swap nbd devices first -while read device etc; do - case "$device" in - /dev/nbd[0-9]) - swapoff "$device" - nbd-client -d "$device" - ;; - /dev/mapper/swap[0-9]) - nbd_device=$(cryptsetup status "$device" | awk '/device:/{print $2}') - swapoff "$device" - cryptsetup remove "$device" - case "$nbd_device" in - /dev/nbd[1-9]) - nbd-client -d "$nbd_device" - ;; - esac - ;; - esac -done < /proc/swaps - -# If we're not using an nbd root, exit -unset root -for param in $(cat /proc/cmdline); do - case "$param" in - root=/dev/nbd[0-9]) - root="${param#root=}" - ;; - esac -done -test -n "$root" || exit 0 - -trap "disconnect" 0 HUP INT QUIT KILL SEGV PIPE TERM -sync -# Give up to 5 seconds for other services to be called. -# If they finish before that time, process termination will start, and the trap -# will be called. -sleep 5 diff -Nru ltsp-5.18.04/client/share/ltsp/update-kernels ltsp-5.18.12/client/share/ltsp/update-kernels --- ltsp-5.18.04/client/share/ltsp/update-kernels 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/share/ltsp/update-kernels 2018-12-25 01:13:20.000000000 +0000 @@ -219,7 +219,7 @@ menu label LTSP, using $method kernel vmlinuz${version:+-"$version"} append ro initrd=initrd.img${version:+-"$version"} $CMDLINE_LINUX_DEFAULT $(eval echo '$CMDLINE_'$method) -ipappend ${IPAPPEND:-2} +ipappend ${IPAPPEND:-3} EOF @@ -263,7 +263,7 @@ menu label LTSP, using $method, with Linux $version kernel vmlinuz-$version append ro initrd=initrd.img-$version $CMDLINE_LINUX_DEFAULT $(eval echo '$CMDLINE_'$method) -ipappend ${IPAPPEND:-2} +ipappend ${IPAPPEND:-3} EOF done @@ -293,7 +293,7 @@ menu label LTSP, using $method, with Linux $version kernel vmlinuz-$version append ro initrd=initrd.img-$version $CMDLINE_LINUX_DEFAULT $(eval echo '$CMDLINE_'$method) -ipappend ${IPAPPEND:-2} +ipappend ${IPAPPEND:-3} EOF done diff -Nru ltsp-5.18.04/client/Ubuntu/etc/ltsp/update-kernels.conf ltsp-5.18.12/client/Ubuntu/etc/ltsp/update-kernels.conf --- ltsp-5.18.04/client/Ubuntu/etc/ltsp/update-kernels.conf 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/Ubuntu/etc/ltsp/update-kernels.conf 2018-12-25 01:13:20.000000000 +0000 @@ -48,10 +48,8 @@ # Preferred default kernel order #LIST_KERNELS_DEFAULT="generic-custom generic-pae-custom" -# Use pxelinux/syslinux's IPAPPEND parameter to add useful networking and -# other system information to the boot commandline: -# 1: Add networking: ip=::: -# 2: Add BOOTIF= -# 3: both 1 & 2 -# 4: Add SYSUUID= -#IPAPPEND=3 +# https://www.syslinux.org/wiki/index.php?title=SYSLINUX#SYSAPPEND_bitmask +# IPAPPEND defaults to 3 for clients to boot in ProxyDHCP mode. +# The downside is that they don't receive DHCP information like DNS, NTP etc. +# If you have a properly configured DHCP server, switch to IPAPPEND=2. +#IPAPPEND=2 diff -Nru ltsp-5.18.04/client/Ubuntu/initscripts/ltsp-core.upstart ltsp-5.18.12/client/Ubuntu/initscripts/ltsp-core.upstart --- ltsp-5.18.04/client/Ubuntu/initscripts/ltsp-core.upstart 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/client/Ubuntu/initscripts/ltsp-core.upstart 1970-01-01 00:00:00.000000000 +0000 @@ -1,40 +0,0 @@ -description "LTSP core client init script" -author "Stéphane Graber " - -start on ((filesystem - and runlevel [!06] - and (drm-device-added card0 PRIMARY_DEVICE_FOR_DISPLAY=1 - or stopped udev-fallback-graphics)) - or runlevel PREVLEVEL=S) -stop on starting rc RUNLEVEL=[06] - -pre-start script - grep -qs "init=/sbin/init-ltsp" /proc/cmdline || exit 0 - - # Make sure the locales are set - if [ -r /etc/default/locale ]; then - . /etc/default/locale - export LANG LANGUAGE - fi - - . /usr/share/ltsp/ltsp-init-common - if [ -f "/etc/ltsp/getltscfg-cluster.conf" ]; then - # Tell the control center that we are booting and get lts.conf - eval $(getltscfg-cluster -a -l boot) || true - fi - - if [ -x /bin/plymouth ]; then - /bin/plymouth quit --retain-splash || true - fi - - start_screen_sessions || true - start_sound || true -end script - -post-stop script - grep -qs "init=/sbin/init-ltsp" /proc/cmdline || exit 0 - - if [ -x /usr/share/ltsp/nbd-disconnect ]; then - /usr/share/ltsp/nbd-disconnect& - fi -end script diff -Nru ltsp-5.18.04/debian/changelog ltsp-5.18.12/debian/changelog --- ltsp-5.18.04/debian/changelog 2018-06-08 02:12:44.000000000 +0000 +++ ltsp-5.18.12/debian/changelog 2018-12-25 01:30:09.000000000 +0000 @@ -1,3 +1,82 @@ +ltsp (5.18.12-1) unstable; urgency=medium + + * New upstream version. + + [ Alkis Georgopoulos ] + * Avoid client hang on shutdown (LP: #1781783). + * Resolve systemd-networkd issues (LP: #1756260). + * Move rofs,cow to /run/initramfs to prevent systemd from unmounting + them on shutdown. + * init-ltsp.d/50-systemd-shutdown replaced nbd-disconnect. + * Drop Ubuntu diff from debian/control. + * Add X-Ubuntu-Depends: ldm-ubuntu-theme for ltsp-client. + * Add snap and swapfile to ltsp-update-image.excludes. + * At 50-system-shutdown, pid 1 is init-ltsp, not systemd. + * Introduce HOST_TO_USERNAME lts.conf directive (LP: #1781774). + * Exclude system journal from the generated image (LP: #1781820). + * Allow backslashes in usernames (LP: #1652260). + * ltsp-config dnsmasq --enable-dns, assumes the default is port=0. + * Introduce ltsp-client-core.postinst to call update-kernels. + * Default to IPAPPEND=3 for ProxyDHCP. + * Properly create rc.local if needed (LP: #1782080). + * Add epoptes to RM_SYSTEM_SERVICES. + * Move the ldm-ubuntu-theme dependency to ldm. + * Update 50-rm-system-services for Ubuntu 18.04. + * Debian: don't ifdown the interfaces on shutdown. + * Avoid getty@.service for all VTs except the first. + * Ubuntu: disable apparmor on fat clients as it crashes libreoffice + (LP: #1783066). + * Debian: add apt-daily.timer to RM_SYSTEM_SERVICES. + * Ubuntu: disable some new unnecessary cronjobs. + * 10-resolv-conf: Domains, not Domain (LP: #1795985). + * 10-resolv-conf: start comment with #, thanks Hyperbyte! + + [ Vagrant Cascadian ] + * server/man: Add lts.conf manpage, generated with go-md2man. + * lts.conf manpage: Update references to /dev/usb/lp0. Thanks to + Wolfgang Schweer. (Closes: #795620). + + [ Wolfgang Schweer ] + * Make 'ltsp-build-client/Debian/000-basic-configuration' more robust. + * Adjust server/Debian/share/ltsp/ltsp-build-client-functions to be apt + compliant. + + [ Vagrant Cascadian ] + * ltsp-build-client-functions: Fix add_mirrors function to only enable + trusted=yes for file: entries. + + [ Wolfgang Schweer and Vagrant Cascadian ] + * Debian: ltsp-client-builder: Use --nfs-root to enable NFS support, and + edit update-kernels.conf.d/nfs. (Closes: #904427). + + [ Wolfgang Schweer ] + * Debian: ltsp-client-builder: Create directory update-kernels.conf.d to + be able to write the update-kernels.conf.d/nfs file. + + [ Vagrant Cascadian ] + * Debian: ltsp-build-client: Ensure configuration directory exists when + enabling nfs-root. + * Debian: ltsp-build-client: Add --trust-file-mirror commandline option + to set [trusted=yes] on file type mirrors. (Closes: #911380). + * Sync translations from Launchpad. + * Debian: ltsp-build-client: Make TRUST_FILE_MIRROR a boolean. + * Install lts.conf man page: + - Add Build-Depends on go-md2man. + - Add Breaks/Replaces on ltsp-docs. + - Drop Suggests/Recommends on ltsp-docs. + * Update manpage version patch. + * debian/control: Update Standards-Version to 4.3.0, no changes. + * debian/control: Update Standards-Version to 4.3.0, no changes. + * ltsp-config: prefer installing from /usr/share/ltsp/examples rather + than /usr/share/doc/ltsp-server/examples, as relying on contents in + doc violates Debian policy, and is potentially very distro-specific. + * Move ltsp-server-dnsmaq.conf into common configuration directory. + * Update to debhelper compatibility level 11. + * ltsp-server: Install ltsp-config examples in /usr/share/ltsp/examples, + adding symlinks to /usr/share/doc/ltsp-server/examples/. + + -- Vagrant Cascadian Mon, 24 Dec 2018 17:30:09 -0800 + ltsp (5.18.04-2) unstable; urgency=medium * Update Maintainer address. diff -Nru ltsp-5.18.04/debian/compat ltsp-5.18.12/debian/compat --- ltsp-5.18.04/debian/compat 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/compat 2018-12-25 01:15:33.000000000 +0000 @@ -1 +1 @@ -10 +11 diff -Nru ltsp-5.18.04/debian/control ltsp-5.18.12/debian/control --- ltsp-5.18.04/debian/control 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/control 2018-12-25 01:15:33.000000000 +0000 @@ -5,8 +5,9 @@ Uploaders: Vagrant Cascadian Build-Depends: automake | automaken, bison, - debhelper (>= 10), + debhelper (>= 11), flex, + go-md2man, libfl-dev, dctrl-tools, libpopt-dev, @@ -14,7 +15,7 @@ pkg-config, po-debconf, help2man -Standards-Version: 4.1.4 +Standards-Version: 4.3.0 Vcs-Git: https://git.launchpad.net/ltsp -b debian/master Vcs-Browser: https://git.launchpad.net/ltsp Homepage: http://ltsp.org @@ -40,7 +41,6 @@ dnsmasq | isc-dhcp-server | dhcp3-server, ldm-server, libasound2-plugins, - ltsp-docs, ltspfs, pulseaudio, qemu-user-static, @@ -48,7 +48,8 @@ x11-utils, xauth Conflicts: ltsp-utils -Replaces: ltsp-utils +Breaks: ltsp-docs +Replaces: ltsp-utils, ltsp-docs Architecture: all Description: basic LTSP server environment This is the basic environment including the minimal features necessary to @@ -62,23 +63,20 @@ Package: ltsp-server-standalone Depends: ${misc:Depends}, ${vendor:Depends}, - gnupg, + dnsmasq (>= 2.41) | tftpd-hpa | atftpd, dnsmasq | isc-dhcp-server | dhcp3-server, + gnupg, ldm-server, libasound2-plugins, ltspfs, ltsp-server (>= ${binary:Version}), + mate-desktop-environment | gnome-session | x-session-manager | x-window-manager, nbd-server (>= 1:2.9.25-2), openbsd-inetd | inet-superserver, openssh-server, squashfs-tools, - dnsmasq (>= 2.41) | tftpd-hpa | atftpd, x11-utils, xauth -X-Debian-Depends: - mate-desktop-environment | gnome-session | x-session-manager | x-window-manager -X-Ubuntu-Depends: gnome-session | mate-desktop-environment | x-session-manager | x-window-manager -Recommends: ltsp-docs Architecture: all Description: complete LTSP server environment This is a complete LTSP server environment with all LTSP server features @@ -88,9 +86,6 @@ LTSP stands for 'Linux Terminal Server Project'. Package: ltsp-client-core -X-Ubuntu-Depends: busybox-static, - udhcpc, - usbutils Pre-Depends: dpkg (>= 1.16.1), Depends: ${misc:Depends}, ${shlibs:Depends}, @@ -144,13 +139,6 @@ LTSP stands for 'Linux Terminal Server Project'. Package: ltsp-client -X-Ubuntu-Depends: dbus, - dmz-cursor-theme, - language-pack-en, - libgl1-mesa-dri, - plymouth-theme-ubuntu-logo, - plymouth-theme-ubuntu-text, - wget X-Debian-Depends: cryptsetup Depends: ${misc:Depends}, ${vendor:Depends}, @@ -173,21 +161,7 @@ sshfs, x11-xserver-utils, xorg -X-Ubuntu-Recommends: fonts-dejavu-core | ttf-dejavu-core, - fonts-freefont-ttf | ttf-freefont, - fonts-guru, - fonts-kacst-one, - fonts-khmeros-core, - fonts-lao, - fonts-liberation, - fonts-nanum, - fonts-takao-pgothic, - fonts-thai-tlwg | ttf-thai-tlwg, - ttf-indic-fonts-core, - ttf-ubuntu-font-family, - ttf-wqy-microhei Recommends: ${vendor:Recommends} -X-Ubuntu-Suggests: zram-config Suggests: ${vendor:Suggests} Architecture: any Description: complete LTSP client environment diff -Nru ltsp-5.18.04/debian/ltsp-client-core.postinst ltsp-5.18.12/debian/ltsp-client-core.postinst --- ltsp-5.18.04/debian/ltsp-client-core.postinst 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.18.12/debian/ltsp-client-core.postinst 2018-12-25 01:15:33.000000000 +0000 @@ -0,0 +1,41 @@ +#!/bin/sh +# Copyright (C) 2018 Alkis Georgopoulos +# SPDX-License-Identifier: GPL-3.0-or-later +# +# Call update-kernels upon ltsp-client-core installation. + +set -e + +# https://www.debian.org/doc/debian-policy/#summary-of-ways-maintainer-scripts-are-called +# The postinst script may be called in the following ways: +# configure +# abort-upgrade +# abort-remove in-favour +# abort-remove +# abort-deconfigure in-favour +# +# [removing ] +# +# But it also can be called like this, from dpkg-reconfigure : +# reconfigure + +case "$1" in + configure) + /usr/share/ltsp/update-kernels + ;; + + abort-upgrade|abort-remove|abort-deconfigure) + ;; + + *) + echo "postinst called with unknown argument \`$1'" >&2 + exit 1 + ;; +esac + +# dh_installdeb will replace this with shell code automatically +# generated by other debhelper scripts. + +#DEBHELPER# + +exit 0 diff -Nru ltsp-5.18.04/debian/ltsp-server.examples ltsp-5.18.12/debian/ltsp-server.examples --- ltsp-5.18.04/debian/ltsp-server.examples 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/ltsp-server.examples 2018-12-25 01:16:11.000000000 +0000 @@ -1,4 +1,2 @@ -server/configs/dhcpd.conf -server/configs/lts.conf server/doc/examples/* client/localapps/doc/examples/* diff -Nru ltsp-5.18.04/debian/ltsp-server.install ltsp-5.18.12/debian/ltsp-server.install --- ltsp-5.18.04/debian/ltsp-server.install 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/ltsp-server.install 2018-12-25 01:16:11.000000000 +0000 @@ -13,3 +13,6 @@ server/ltsp-info usr/bin/ server/ltsp-config /usr/sbin/ server/configs/ltsp-update-image.excludes /etc/ltsp/ +server/configs/dhcpd.conf /usr/share/ltsp/examples/ +server/configs/lts.conf /usr/share/ltsp/examples/ +server/configs/ltsp-server-dnsmasq.conf /usr/share/ltsp/examples/ diff -Nru ltsp-5.18.04/debian/ltsp-server.links ltsp-5.18.12/debian/ltsp-server.links --- ltsp-5.18.04/debian/ltsp-server.links 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.18.12/debian/ltsp-server.links 2018-12-25 00:57:57.000000000 +0000 @@ -0,0 +1,3 @@ +/usr/share/ltsp/examples/dhcpd.conf /usr/share/doc/ltsp-server/examples/dhcpd.conf +/usr/share/ltsp/examples/lts.conf /usr/share/doc/ltsp-server/examples/lts.conf +/usr/share/ltsp/examples/ltsp-server-dnsmasq.conf /usr/share/doc/ltsp-server/examples/ltsp-server-dnsmasq.conf diff -Nru ltsp-5.18.04/debian/ltsp-server.manpages ltsp-5.18.12/debian/ltsp-server.manpages --- ltsp-5.18.04/debian/ltsp-server.manpages 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/ltsp-server.manpages 2018-12-25 01:15:33.000000000 +0000 @@ -3,4 +3,5 @@ # overwrite with autogenerated manpages. server/man/*.8 server/man/*.1 +server/man/*.5 client/localapps/doc/ltsp-localapps.1 diff -Nru ltsp-5.18.04/debian/patches/jetpipe-from-ltsp-client-core-init-script ltsp-5.18.12/debian/patches/jetpipe-from-ltsp-client-core-init-script --- ltsp-5.18.04/debian/patches/jetpipe-from-ltsp-client-core-init-script 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/patches/jetpipe-from-ltsp-client-core-init-script 1970-01-01 00:00:00.000000000 +0000 @@ -1,82 +0,0 @@ -Author: Vagrant Cascadian -Bug-Debian: http://bugs.debian.org/700881 -Upstream-Bug: https://bugs.launchpad.net/ltsp/+bug/996533 - -Start jetpipe from ltsp-client-core init script, as it fails to daemonize when -executed from init-ltsp.d, which is run before /sbin/init is started. - -Index: ltsp/client/initscripts/ltsp-core -=================================================================== ---- ltsp.orig/client/initscripts/ltsp-core 2013-11-05 13:06:00.011606123 -0500 -+++ ltsp/client/initscripts/ltsp-core 2013-11-05 13:06:02.591618929 -0500 -@@ -35,6 +35,33 @@ - . /lib/lsb/init-functions - . /usr/share/ltsp/ltsp-init-common - -+start_printers() { -+for I in 0 1 2; do -+ eval PRINTER_DEVICE=\$\{PRINTER_${I}_DEVICE\} -+ if [ -n "${PRINTER_DEVICE}" ]; then -+ eval PORT=\$\{PRINTER_${I}_PORT:="910${I}"\} -+ eval BAUD=\$\{PRINTER_${I}_SPEED:-"9600"\} -+ eval SIZE=\$\{PRINTER_${I}_DATABITS:-"8"\} -+ eval PARITY=\$\{PRINTER_${I}_PARITY:-"none"\} -+ eval FLOW=\$\{PRINTER_${I}_FLOWCTRL:-"soft"\} -+ -+ JETPIPE_ARGS= -+ [ -n "$BAUD" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -b ${BAUD}" -+ [ -n "$SIZE" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -y ${SIZE}" -+ [ -n "$PARITY" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -p ${PARITY}" -+ if [ -n "$FLOW" ]; then -+ if [ "$FLOW" = "soft" ]; then -+ JETPIPE_ARGS="${JETPIPE_ARGS} -x" -+ else -+ JETPIPE_ARGS="${JETPIPE_ARGS} -r" -+ fi -+ fi -+ -+ /usr/sbin/jetpipe ${JETPIPE_ARGS} ${PRINTER_DEVICE} ${PORT} -+ fi -+done -+} -+ - case "$1" in - start) - log_action_begin_msg "Starting LTSP client..." -@@ -48,6 +75,7 @@ - /bin/plymouth quit --retain-splash || true - fi - -+ start_printers || true - start_screen_sessions || true - start_sound || true - -Index: ltsp/client/share/ltsp/init-ltsp.d/50-jetpipe -=================================================================== ---- ltsp.orig/client/share/ltsp/init-ltsp.d/50-jetpipe 2013-11-05 13:06:00.011606123 -0500 -+++ /dev/null 1970-01-01 00:00:00.000000000 +0000 -@@ -1,24 +0,0 @@ --for I in 0 1 2; do -- eval PRINTER_DEVICE=\$\{PRINTER_${I}_DEVICE\} -- if [ -n "${PRINTER_DEVICE}" ]; then -- eval PORT=\$\{PRINTER_${I}_PORT:="910${I}"\} -- eval BAUD=\$\{PRINTER_${I}_SPEED:-"9600"\} -- eval SIZE=\$\{PRINTER_${I}_DATABITS:-"8"\} -- eval PARITY=\$\{PRINTER_${I}_PARITY:-"none"\} -- eval FLOW=\$\{PRINTER_${I}_FLOWCTRL:-"soft"\} -- -- JETPIPE_ARGS= -- [ -n "$BAUD" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -b ${BAUD}" -- [ -n "$SIZE" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -y ${SIZE}" -- [ -n "$PARITY" ] && JETPIPE_ARGS="${JETPIPE_ARGS} -p ${PARITY}" -- if [ -n "$FLOW" ]; then -- if [ "$FLOW" = "soft" ]; then -- JETPIPE_ARGS="${JETPIPE_ARGS} -x" -- else -- JETPIPE_ARGS="${JETPIPE_ARGS} -r" -- fi -- fi -- -- /usr/sbin/jetpipe ${JETPIPE_ARGS} ${PRINTER_DEVICE} ${PORT} & -- fi --done diff -Nru ltsp-5.18.04/debian/patches/manpages-use-debian-version ltsp-5.18.12/debian/patches/manpages-use-debian-version --- ltsp-5.18.04/debian/patches/manpages-use-debian-version 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/patches/manpages-use-debian-version 2018-12-25 01:15:33.000000000 +0000 @@ -1,13 +1,13 @@ Use the Debian package version when generating manpages with help2man. -Index: ltsp-trunk/server/man/Makefile.am +Index: ltsp/server/man/Makefile.am =================================================================== ---- ltsp-trunk.orig/server/man/Makefile.am 2014-02-04 15:26:16.546570000 -0800 -+++ ltsp-trunk/server/man/Makefile.am 2014-02-04 15:27:31.281910000 -0800 +--- ltsp.orig/server/man/Makefile.am ++++ ltsp/server/man/Makefile.am @@ -1,7 +1,7 @@ dist_man_MANS = ltsp-chroot.8 ltsp-config.8 ltsp-info.1 \ ltsp-update-image.8 ltsp-update-kernels.8 ltsp-update-sshkeys.8 \ - ltsp-build-client.8 + ltsp-build-client.8 lts.conf.5 -H2M_COMMON_FLAGS = -N --include="include/common.h2m" +H2M_COMMON_FLAGS = -N --version-string=$(DEB_VERSION) --include="include/common.h2m" diff -Nru ltsp-5.18.04/debian/patches/redhat-mock-chroot-shebang ltsp-5.18.12/debian/patches/redhat-mock-chroot-shebang --- ltsp-5.18.04/debian/patches/redhat-mock-chroot-shebang 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/patches/redhat-mock-chroot-shebang 1970-01-01 00:00:00.000000000 +0000 @@ -1,13 +0,0 @@ -This is a shell script snippet included from ltsp-build-client, and -thus should not have it's own shebang line. Patching this out to -please lintian. - -Index: ltsp/server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot -=================================================================== ---- ltsp.orig/server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot -+++ ltsp/server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot -@@ -1,4 +1,3 @@ --#!/bin/sh - - set -x - diff -Nru ltsp-5.18.04/debian/patches/series ltsp-5.18.12/debian/patches/series --- ltsp-5.18.04/debian/patches/series 2018-06-08 02:01:54.000000000 +0000 +++ ltsp-5.18.12/debian/patches/series 2018-12-25 01:18:18.000000000 +0000 @@ -1,7 +1,3 @@ -use-test-binary -jetpipe-from-ltsp-client-core-init-script manpages-use-debian-version disable-default-encrypted-swap.patch reproducible-mo-files -redhat-mock-chroot-shebang -upstream/0001-init-ltsp.d-09-hostname-Use-for-awk-exponent-operato.patch diff -Nru ltsp-5.18.04/debian/patches/upstream/0001-init-ltsp.d-09-hostname-Use-for-awk-exponent-operato.patch ltsp-5.18.12/debian/patches/upstream/0001-init-ltsp.d-09-hostname-Use-for-awk-exponent-operato.patch --- ltsp-5.18.04/debian/patches/upstream/0001-init-ltsp.d-09-hostname-Use-for-awk-exponent-operato.patch 2018-06-08 02:01:46.000000000 +0000 +++ ltsp-5.18.12/debian/patches/upstream/0001-init-ltsp.d-09-hostname-Use-for-awk-exponent-operato.patch 1970-01-01 00:00:00.000000000 +0000 @@ -1,27 +0,0 @@ -From b3fc0733af75bf993510e4e1908043f2fc896e74 Mon Sep 17 00:00:00 2001 -From: Vagrant Cascadian -Date: Thu, 7 Jun 2018 18:56:51 -0700 -Subject: [PATCH] init-ltsp.d/09-hostname: Use "^" for awk exponent operator, - which is defined in the awk POSIX standard, and should have broadest - compatibility across implementations. - ---- - client/share/ltsp/init-ltsp.d/09-hostname | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/client/share/ltsp/init-ltsp.d/09-hostname b/client/share/ltsp/init-ltsp.d/09-hostname -index 8def062f..1508ef04 100644 ---- a/client/share/ltsp/init-ltsp.d/09-hostname -+++ b/client/share/ltsp/init-ltsp.d/09-hostname -@@ -8,7 +8,7 @@ if [ -z "$HOSTNAME" ]; then - ip|"") - HOSTNAME_EXTRA=$(ip -oneline -family inet address show dev $DEVICE | - sed 's/.* \([0-9.]*\)\/\([0-9]*\) .*/\1.\2/' | -- awk -F "." '{ print (2**24*$1+2**16*$2+2**8*$3+$4)%(2**(32-$5)) }') -+ awk -F "." '{ print (2^24*$1+2^16*$2+2^8*$3+$4)%(2^(32-$5)) }') - ;; - esac - HOSTNAME="$HOSTNAME_BASE$HOSTNAME_EXTRA" --- -2.11.0 - diff -Nru ltsp-5.18.04/debian/patches/use-test-binary ltsp-5.18.12/debian/patches/use-test-binary --- ltsp-5.18.04/debian/patches/use-test-binary 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/patches/use-test-binary 1970-01-01 00:00:00.000000000 +0000 @@ -1,17 +0,0 @@ -## use-test-binary.dpatch by Vagrant Cascadian -## -## DP: use /usr/bin/test instead of relying on the shell test builtin, as bash -## DP: and dash behave inconsistantly. works around -## DP: http://bugs.debian.org/539909 - -Index: ltsp-trunk/client/share/ltsp/init-ltsp.d/50-cron -=================================================================== ---- ltsp-trunk.orig/client/share/ltsp/init-ltsp.d/50-cron 2012-05-14 13:56:00.417535605 -0700 -+++ ltsp-trunk/client/share/ltsp/init-ltsp.d/50-cron 2012-05-14 13:57:44.218050317 -0700 -@@ -1,5 +1,5 @@ - CRON_FILE=/etc/cron.d/ltsp --if [ ! -w "/etc/cron.d" ]; then -+if ! /usr/bin/test -w "/etc/cron.d" ; then - echo "Warning: /etc/cron.d is not writeable." - return 1 - fi diff -Nru ltsp-5.18.04/debian/rules ltsp-5.18.12/debian/rules --- ltsp-5.18.04/debian/rules 2018-06-08 02:01:01.000000000 +0000 +++ ltsp-5.18.12/debian/rules 2018-12-25 01:15:33.000000000 +0000 @@ -47,7 +47,6 @@ override_dh_installinit: # Copy default and init scripts from upstream code cp $(CURDIR)/client/initscripts/ltsp-core $(CURDIR)/debian/ltsp-client-core.init - cp $(CURDIR)/client/Ubuntu/initscripts/ltsp-core.upstart $(CURDIR)/debian/ltsp-client-core.upstart dh_installinit -a --no-start override_dh_install: diff -Nru ltsp-5.18.04/po/am.po ltsp-5.18.12/po/am.po --- ltsp-5.18.04/po/am.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/am.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2017-04-10 12:03+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Amharic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "የ ተለቀቀው የ እትም ቁጥር (el6,fc18,fc19) * አሁን አይሰራም" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -652,3 +658,7 @@ #, sh-format msgid "set the name of the chroot" msgstr "" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "የ ተለቀቀው የ እትም ቁጥር (el6,fc18,fc19) * አሁን አይሰራም" diff -Nru ltsp-5.18.04/po/ar.po ltsp-5.18.12/po/ar.po --- ltsp-5.18.04/po/ar.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ar.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:49+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Arabic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/bs.po ltsp-5.18.12/po/bs.po --- ltsp-5.18.04/po/bs.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/bs.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2018-04-06 23:35+0000\n" "Last-Translator: Samir Ribić \n" "Language-Team: Bosnian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2018-04-08 04:30+0000\n" -"X-Generator: Launchpad (build 18599)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -312,6 +312,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "Nemoj automatski detektovati apt proxy konfiguraciju" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -449,6 +454,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -481,6 +491,7 @@ msgstr "Staza do chroot-creator keša" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -595,11 +606,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/ca.po ltsp-5.18.12/po/ca.po --- ltsp-5.18.04/po/ca.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ca.po 2018-12-25 01:13:20.000000000 +0000 @@ -9,15 +9,15 @@ msgstr "" "Project-Id-Version: 5.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:58+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Catalan \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: ca\n" #: ../common/ltsp-common-functions:194 @@ -318,6 +318,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "no detectar automàticament la configuració del proxy de l'apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -458,6 +463,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -492,6 +502,7 @@ msgstr "Camí a la cau del chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -609,11 +620,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/ce.po ltsp-5.18.12/po/ce.po --- ltsp-5.18.04/po/ce.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ce.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2014-08-13 08:41+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Chechen \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -306,6 +306,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -439,6 +444,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -471,6 +481,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -585,11 +596,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/cs.po ltsp-5.18.12/po/cs.po --- ltsp-5.18.04/po/cs.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/cs.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp 5.1.91\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2017-11-16 05:45+0000\n" "Last-Translator: Pavel Borecki \n" "Language-Team: Czech \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: cs\n" #: ../common/ltsp-common-functions:194 @@ -322,6 +322,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "nerozpoznávat nastavení apt proxy automaticky" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -461,6 +466,11 @@ msgid "skip squashfs image creation" msgstr "přeskočit vytvoření squashfs obrazu" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -493,6 +503,7 @@ msgstr "Cesta k cache chroot-creatoru" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -611,11 +622,6 @@ msgid "Set video card drivers to install" msgstr "Vyberte ovladač který nainstalovat pro grafický čip" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Číslo verze vydání (el6,fc18,fc19) * Ještě nefunguje" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -687,3 +693,7 @@ #~ msgstr "" #~ "INFO: zakazují se zdroje s bezpečnostními aktualizacemi pro sid, protože " #~ "neexistují." + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Číslo verze vydání (el6,fc18,fc19) * Ještě nefunguje" diff -Nru ltsp-5.18.04/po/da.po ltsp-5.18.12/po/da.po --- ltsp-5.18.04/po/da.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/da.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:38+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Danish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/de.po ltsp-5.18.12/po/de.po --- ltsp-5.18.04/po/de.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/de.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp 5.4.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2016-12-04 06:34+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: German \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: de\n" "X-Poedit-SourceCharset: utf-8\n" @@ -24,7 +24,7 @@ msgid "translator-credits" msgstr "" "Launchpad Contributions:\n" -" Daniel Winzen https://launchpad.net/~q-d\n" +" Daniel Winzen https://launchpad.net/~q-d-deactivatedaccount\n" " Hendrik Knackstedt https://launchpad.net/~hennekn\n" " Jan https://launchpad.net/~jancborchardt-deactivatedaccount\n" " Jan Middelkoop https://launchpad.net/~jan-recreatie-zorg\n" @@ -340,6 +340,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "Konfiguration für Apt-Proxy nicht automatisch erkennen" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -484,6 +489,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -519,6 +529,7 @@ "Pfad zum Cache, der vom Erstellungs-Prozess des Chroot verwendet werden soll" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -637,12 +648,6 @@ msgid "Set video card drivers to install" msgstr "zu installierende Grafikkarten-Treiber angeben" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" -"Veröffentlichungs-Versionsnummer (el6,fc18,fc19) * Noch nicht funktionierend" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -716,3 +721,8 @@ #~ msgstr "" #~ "HINWEIS: In der Datei sources.list von apt wurde der Eintrag »security« für " #~ "Sid deaktiviert, da diese Komponente nicht existiert." + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "" +#~ "Veröffentlichungs-Versionsnummer (el6,fc18,fc19) * Noch nicht funktionierend" diff -Nru ltsp-5.18.04/po/el.po ltsp-5.18.12/po/el.po --- ltsp-5.18.04/po/el.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/el.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp 5.1\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2017-05-18 19:27+0000\n" "Last-Translator: Alkis Georgopoulos \n" "Language-Team: Greek\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=utf-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "X-Poedit-Country: GREECE\n" "Language: \n" "X-Poedit-Language: Greek\n" @@ -324,6 +324,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "να μη γίνει αυτόματος έλεγχος των ρυθμίσεων του διαμεσολαβητή apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -466,6 +471,11 @@ msgid "skip squashfs image creation" msgstr "παράλειψη της δημιουργίας εικόνας squashfs" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -499,6 +509,7 @@ msgstr "Διαδομή για την προσωρινή μνήμη του chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -618,11 +629,6 @@ msgid "Set video card drivers to install" msgstr "Ορισμός των οδηγών καρτών γραφικών προς εγκατάσταση" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Αριθμός έκδοσης (el6,fc18,fc19) * Δεν είναι ακόμα έτοιμο" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -695,3 +701,7 @@ #~ msgstr "" #~ "ΣΗΜΕΙΩΣΗ: απενεργοποιείται η πηγή APT για τις ενημερώσεις ασφαλείας για το " #~ "sid. Δεν υπάρχει." + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Αριθμός έκδοσης (el6,fc18,fc19) * Δεν είναι ακόμα έτοιμο" diff -Nru ltsp-5.18.04/po/en_AU.po ltsp-5.18.12/po/en_AU.po --- ltsp-5.18.04/po/en_AU.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/en_AU.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2014-01-01 12:22+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: English (Australia) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -311,6 +311,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -444,6 +449,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -476,6 +486,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -590,11 +601,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Release version number (el6,fc18,fc19) * Not working yet" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -656,3 +662,7 @@ #, sh-format msgid "set the name of the chroot" msgstr "" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Release version number (el6,fc18,fc19) * Not working yet" diff -Nru ltsp-5.18.04/po/en_CA.po ltsp-5.18.12/po/en_CA.po --- ltsp-5.18.04/po/en_CA.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/en_CA.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:57+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: English (Canada) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/en_GB.po ltsp-5.18.12/po/en_GB.po --- ltsp-5.18.04/po/en_GB.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/en_GB.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2017-06-29 22:57+0000\n" "Last-Translator: Andi Chandler \n" "Language-Team: English (United Kingdom) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -319,6 +319,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "do not autodetect apt proxy configuration" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -455,6 +460,11 @@ msgid "skip squashfs image creation" msgstr "skip squashfs image creation" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -487,6 +497,7 @@ msgstr "Path to chroot-creator cache" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -602,11 +613,6 @@ msgid "Set video card drivers to install" msgstr "Set video card drivers to install" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Release version number (el6,fc18,fc19) * Not working yet" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -676,3 +682,7 @@ #, sh-format #~ msgid "mounts CDROM before installation" #~ msgstr "mounts CDROM before installation" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Release version number (el6,fc18,fc19) * Not working yet" diff -Nru ltsp-5.18.04/po/es.po ltsp-5.18.12/po/es.po --- ltsp-5.18.04/po/es.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/es.po 2018-12-25 01:13:20.000000000 +0000 @@ -10,15 +10,15 @@ msgstr "" "Project-Id-Version: es\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2016-12-04 06:34+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: spanish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: \n" #: ../common/ltsp-common-functions:194 @@ -334,6 +334,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "no autodetectar la configuración del proxy apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -475,6 +480,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -507,6 +517,7 @@ msgstr "Ruta a la caché del creador de chroot" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -621,12 +632,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" -"Número de versión de la emisión (el6,fc18,fc19) * No funciona todavía" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -696,3 +701,8 @@ #, sh-format #~ msgid "mounts CDROM before installation" #~ msgstr "monta el CDROM antes de instalar" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "" +#~ "Número de versión de la emisión (el6,fc18,fc19) * No funciona todavía" diff -Nru ltsp-5.18.04/po/et.po ltsp-5.18.12/po/et.po --- ltsp-5.18.04/po/et.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/et.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2015-09-02 11:27+0000\n" "Last-Translator: Lauri Võsandi \n" "Language-Team: Estonian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -310,6 +310,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -443,6 +448,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -475,6 +485,7 @@ msgstr "chroot-creator puhvri asukoht" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -589,11 +600,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Väljalaske versiooninumber (el6,fc18,fc19) * Ei tööta veel" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -653,3 +659,7 @@ #, sh-format msgid "set the name of the chroot" msgstr "" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Väljalaske versiooninumber (el6,fc18,fc19) * Ei tööta veel" diff -Nru ltsp-5.18.04/po/eu.po ltsp-5.18.12/po/eu.po --- ltsp-5.18.04/po/eu.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/eu.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-14 20:21+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Basque \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -306,6 +306,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -439,6 +444,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -471,6 +481,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -585,11 +596,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/fa.po ltsp-5.18.12/po/fa.po --- ltsp-5.18.04/po/fa.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/fa.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-14 20:21+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Persian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -306,6 +306,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -439,6 +444,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -471,6 +481,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -585,11 +596,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/fi.po ltsp-5.18.12/po/fi.po --- ltsp-5.18.04/po/fi.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/fi.po 2018-12-25 01:13:20.000000000 +0000 @@ -3,15 +3,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:48+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: debian-10n-finnish@lists.debian.org\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: fi\n" #: ../common/ltsp-common-functions:194 @@ -312,6 +312,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "Älä selvitä automaattisesti aptin välityspalvelinasetuksia" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -448,6 +453,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -482,6 +492,7 @@ msgstr "chroot-creator-välimuistin polku" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -596,11 +607,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/fo.po ltsp-5.18.12/po/fo.po --- ltsp-5.18.04/po/fo.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/fo.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:58+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Faroese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/fr.po ltsp-5.18.12/po/fr.po --- ltsp-5.18.04/po/fr.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/fr.po 2018-12-25 01:13:20.000000000 +0000 @@ -9,15 +9,15 @@ msgstr "" "Project-Id-Version: ltsp 5.1.99\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2014-10-23 19:25+0000\n" "Last-Translator: EmmanuelLeNormand \n" "Language-Team: French \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: fr\n" #: ../common/ltsp-common-functions:194 @@ -333,6 +333,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "ne pas détecter automatiquement la configuration du proxy apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -477,6 +482,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -510,6 +520,7 @@ msgstr "Chemin vers le cache du créateur de chroot" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -629,12 +640,6 @@ msgid "Set video card drivers to install" msgstr "Définir le pilote de la carte vidéo à installer" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" -"Numéro de la version Release (el6,fc18,fc19) * Ne fonctionne pas encore" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -706,3 +711,8 @@ #, sh-format #~ msgid "mounts CDROM before installation" #~ msgstr "monter le CDROM avant l'installation" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "" +#~ "Numéro de la version Release (el6,fc18,fc19) * Ne fonctionne pas encore" diff -Nru ltsp-5.18.04/po/gl.po ltsp-5.18.12/po/gl.po --- ltsp-5.18.04/po/gl.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/gl.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2015-12-13 10:24+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Galician \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -316,6 +316,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -451,6 +456,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -483,6 +493,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -599,11 +610,6 @@ msgid "Set video card drivers to install" msgstr "Estabelecer controladores a instalar da tarxeta de vídeo" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Número de versión (el6,fc18,fc19) * Aínda non funciona" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -665,3 +671,7 @@ #, sh-format msgid "set the name of the chroot" msgstr "" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Número de versión (el6,fc18,fc19) * Aínda non funciona" diff -Nru ltsp-5.18.04/po/he.po ltsp-5.18.12/po/he.po --- ltsp-5.18.04/po/he.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/he.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2016-07-10 20:31+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Hebrew \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -311,6 +311,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -444,6 +449,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -476,6 +486,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -590,11 +601,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/hr.po ltsp-5.18.12/po/hr.po --- ltsp-5.18.04/po/hr.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/hr.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2017-07-30 22:01+0000\n" "Last-Translator: FULL NAME \n" "Language-Team: Croatian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -75,7 +75,7 @@ #: ../server/ALTLinux/configs/ltsp-login.sh:103 #, sh-format msgid "Login Warning" -msgstr "Upozorenje kod prijave" +msgstr "Upozorenje prijave" #: ../server/ALTLinux/configs/ltsp-login.sh:94 #, sh-format @@ -308,6 +308,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -441,6 +446,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -473,6 +483,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -587,11 +598,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/hu.po ltsp-5.18.12/po/hu.po --- ltsp-5.18.04/po/hu.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/hu.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2016-01-04 13:03+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Hungarian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/id.po ltsp-5.18.12/po/id.po --- ltsp-5.18.04/po/id.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/id.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:39+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Indonesian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -315,6 +315,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -448,6 +453,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -480,6 +490,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -594,11 +605,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/is.po ltsp-5.18.12/po/is.po --- ltsp-5.18.04/po/is.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/is.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-14 20:21+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Icelandic \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -306,6 +306,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -439,6 +444,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -471,6 +481,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -585,11 +596,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/it.po ltsp-5.18.12/po/it.po --- ltsp-5.18.04/po/it.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/it.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2016-07-10 20:27+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Italian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: it\n" #: ../common/ltsp-common-functions:194 @@ -325,6 +325,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "non rilevare automaticamente la configurazione del proxy APT" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -466,6 +471,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -499,6 +509,7 @@ msgstr "Percorso della cache di chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -617,11 +628,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/ja.po ltsp-5.18.12/po/ja.po --- ltsp-5.18.04/po/ja.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ja.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2015-02-17 18:38+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Japanese\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: \n" #: ../common/ltsp-common-functions:194 @@ -313,6 +313,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "apt のプロキシ設定を自動的に検出しないようにする" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -446,6 +451,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -478,6 +488,7 @@ msgstr "chroot-creator キャッシュへのパス (path)" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -592,11 +603,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/ko.po ltsp-5.18.12/po/ko.po --- ltsp-5.18.04/po/ko.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ko.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-11-23 12:28+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Korean \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -312,6 +312,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -445,6 +450,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -477,6 +487,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -591,11 +602,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/ku.po ltsp-5.18.12/po/ku.po --- ltsp-5.18.04/po/ku.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ku.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-14 20:21+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Kurdish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -306,6 +306,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -439,6 +444,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -471,6 +481,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -585,11 +596,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/lt.po ltsp-5.18.12/po/lt.po --- ltsp-5.18.04/po/lt.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/lt.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:29+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Lithuanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/ltsp.pot ltsp-5.18.12/po/ltsp.pot --- ltsp-5.18.04/po/ltsp.pot 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ltsp.pot 2018-12-25 01:13:20.000000000 +0000 @@ -6,9 +6,9 @@ #, fuzzy msgid "" msgstr "" -"Project-Id-Version: ltsp 5.18.04\n" +"Project-Id-Version: ltsp 5.18.12\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2018-04-23 16:15-0700\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -306,6 +306,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -439,6 +444,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -471,7 +481,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:7 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" diff -Nru ltsp-5.18.04/po/ms.po ltsp-5.18.12/po/ms.po --- ltsp-5.18.04/po/ms.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ms.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-06-10 09:09+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Malay \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -317,6 +317,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "jangan kesan-sendiri konfigurasi proksi apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -454,6 +459,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -486,6 +496,7 @@ msgstr "Laluan ke cache chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -602,11 +613,6 @@ msgid "Set video card drivers to install" msgstr "Tetapkan pemacu kad video untuk dipasang" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Nombor versi keluaran (el6,fc18,fc19) * Tidak berfungsi lagi" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -677,3 +683,7 @@ #, sh-format #~ msgid "mounts CDROM before installation" #~ msgstr "lekap CDROM sebelum pemasangan" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Nombor versi keluaran (el6,fc18,fc19) * Tidak berfungsi lagi" diff -Nru ltsp-5.18.04/po/nb.po ltsp-5.18.12/po/nb.po --- ltsp-5.18.04/po/nb.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/nb.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:44+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Norwegian Bokmal \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -310,6 +310,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -443,6 +448,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -475,6 +485,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -589,11 +600,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/nl.po ltsp-5.18.12/po/nl.po --- ltsp-5.18.04/po/nl.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/nl.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:33+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Dutch \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -27,6 +27,7 @@ " Bert Van de Poel https://launchpad.net/~bhack\n" " Jan Middelkoop https://launchpad.net/~jan-recreatie-zorg\n" " Jim McQuillan https://launchpad.net/~jam-mcquil\n" +" Pjotr12345 https://launchpad.net/~computertip\n" " Rachid https://launchpad.net/~rachidbm\n" " Wim Muskee https://launchpad.net/~wimmuskee\n" " itronic https://launchpad.net/~itronic\n" @@ -109,7 +110,7 @@ #: ../server/ltsp-build-client:191 #, sh-format msgid "output version information and exit" -msgstr "" +msgstr "toon versie informatie en sluit af" #: ../server/ltsp-build-client:195 #, sh-format @@ -302,6 +303,8 @@ msgid "" "NOTE: disabling security and updates APT sources for sid. They do not exist." msgstr "" +"Let op: de pakketbronnen voor sid voor (veiligheids)reparaties worden " +"uitgeschakeld. Ze bestaan niet." #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-enable-popcon:3 #, sh-format @@ -323,6 +326,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "apt-proxyconfiguratie niet automatisch detecteren" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -464,6 +472,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -497,6 +510,7 @@ msgstr "Pad naar chroot-creator cache" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -616,11 +630,6 @@ msgid "Set video card drivers to install" msgstr "Zet videokaart drivers om te installeren" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -640,6 +649,8 @@ "set the linuxmint distribution to be used for install, defaults to running " "distribution" msgstr "" +"stel de Linux Mint-distributie in die moet worden gebruikt voor installatie " +"(de draaiende distributie is de standaard)" #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:3 #, sh-format @@ -691,3 +702,7 @@ #~ msgstr "" #~ "OPMERKING: APT bron 'security' voor sid wordt uitgeschakeld. Deze bestaat " #~ "niet." + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Uitgaveversienummer (el6,fc18,fc19) * Werkt nog niet" diff -Nru ltsp-5.18.04/po/nn.po ltsp-5.18.12/po/nn.po --- ltsp-5.18.04/po/nn.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/nn.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-14 20:21+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Norwegian Nynorsk \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -306,6 +306,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -439,6 +444,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -471,6 +481,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -585,11 +596,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/oc.po ltsp-5.18.12/po/oc.po --- ltsp-5.18.04/po/oc.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/oc.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:47+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Occitan (post 1500) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -310,6 +310,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -443,6 +448,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -475,6 +485,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -589,11 +600,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/pl.po ltsp-5.18.12/po/pl.po --- ltsp-5.18.04/po/pl.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/pl.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp 5.1.91\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2014-05-30 15:48+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Polish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: pl\n" #: ../common/ltsp-common-functions:194 @@ -324,6 +324,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "nie wykrywaj automatycznie konfiguracji proxy dla apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -462,6 +467,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -495,6 +505,7 @@ msgstr "Katalog podręczny dla programu chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -614,11 +625,6 @@ msgid "Set video card drivers to install" msgstr "ustaw sterowniki karty graficznej do instalacji" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/pt_BR.po ltsp-5.18.12/po/pt_BR.po --- ltsp-5.18.04/po/pt_BR.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/pt_BR.po 2018-12-25 01:13:20.000000000 +0000 @@ -9,15 +9,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2014-08-15 22:39+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: l10n portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: \n" #: ../common/ltsp-common-functions:194 @@ -45,8 +45,7 @@ " Rafael Neri https://launchpad.net/~rafepel\n" " Renato Krause https://launchpad.net/~renatokrause\n" " Sebastião Luiz Guerra https://launchpad.net/~sebastiao-luiz-guerra\n" -" Tiago Hillebrandt https://launchpad.net/~tiagohillebrandt\n" -" Vinicius Almeida https://launchpad.net/~vinicius-algo" +" Tiago Hillebrandt https://launchpad.net/~tiagohillebrandt" #: ../server/ALTLinux/configs/ltsp-login.sh:30 #: ../server/ALTLinux/configs/ltsp-login.sh:33 @@ -339,6 +338,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "não detectar automaticamente a configuração de proxy do apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -480,6 +484,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -512,6 +521,7 @@ msgstr "Caminho para o cache do criador de chroot" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -629,11 +639,6 @@ msgid "Set video card drivers to install" msgstr "Definir os drivers de placa de vídeo que serão instalados" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/pt.po ltsp-5.18.12/po/pt.po --- ltsp-5.18.04/po/pt.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/pt.po 2018-12-25 01:13:20.000000000 +0000 @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2015-12-13 10:25+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Portuguese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: pt\n" #: ../common/ltsp-common-functions:194 @@ -322,6 +322,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "não detectar automaticamente a configuração do proxy apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -464,6 +469,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -497,6 +507,7 @@ msgstr "Caminho para a cache do chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -615,11 +626,6 @@ msgid "Set video card drivers to install" msgstr "Defina os controladores da placa de vídeo a instalar" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Número da versão (el6,fc18,fc19) * Ainda não funcional" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -689,3 +695,7 @@ #, sh-format #~ msgid "NOTE: disabling security APT source for sid. It does not exist." #~ msgstr "NOTA: a desactivar a fonte APT de segurança para sid. Não existe." + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Número da versão (el6,fc18,fc19) * Ainda não funcional" diff -Nru ltsp-5.18.04/po/README ltsp-5.18.12/po/README --- ltsp-5.18.04/po/README 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/README 2018-12-25 01:13:20.000000000 +0000 @@ -18,4 +18,5 @@ * Launchpad pulls ltsp.pot from there and allows translators to translate it online. * When there are new translations, it daily pushes the updated .po files at https://code.launchpad.net/~ltsp-upstream/ltsp/ltsp-translations * Before release, we should manually pull po/*.po from ltsp-translations and push them to the upstream git repository. + (e.g. git merge --squash --allow-unrelated-histories --strategy=recursive --strategy-option=theirs translations/master) * We have configured launchpad to only read *.pot and ignore *.po, so we shouldn't commit any new .po files sent e.g. by email. We should instruct translators to use launchpad instead. Also the translator credits are kept there internally in launchpad, and exposed in a special string called "translator-credits" which can be shown in about dialogs etc. diff -Nru ltsp-5.18.04/po/ro.po ltsp-5.18.12/po/ro.po --- ltsp-5.18.04/po/ro.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ro.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-14 20:21+0000\n" "Last-Translator: Launchpad Translations Administrators \n" "Language-Team: Romanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -306,6 +306,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -439,6 +444,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -471,6 +481,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -585,11 +596,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/ru.po ltsp-5.18.12/po/ru.po --- ltsp-5.18.04/po/ru.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ru.po 2018-12-25 01:13:20.000000000 +0000 @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2016-07-10 20:32+0000\n" "Last-Translator: fignya \n" "Language-Team: Russian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: ru\n" #: ../common/ltsp-common-functions:194 @@ -319,6 +319,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "выключить автоматическое определение настроек apt прокси" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -456,6 +461,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -489,6 +499,7 @@ msgstr "Путь к кэшу chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -606,11 +617,6 @@ msgid "Set video card drivers to install" msgstr "Выбрать драйвер видеокарты для установки" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/se.po ltsp-5.18.12/po/se.po --- ltsp-5.18.04/po/se.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/se.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:57+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Northern Sami \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/sk.po ltsp-5.18.12/po/sk.po --- ltsp-5.18.04/po/sk.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/sk.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp 5.2.6\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 16:01+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Slovak \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: \n" #: ../common/ltsp-common-functions:194 @@ -313,6 +313,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "nerobí auto nastavenie APT proxy" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -448,6 +453,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -480,6 +490,7 @@ msgstr "Cesta k vyrovnávacej pamäti chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -594,11 +605,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/sl.po ltsp-5.18.12/po/sl.po --- ltsp-5.18.04/po/sl.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/sl.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:38+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Slovenian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -310,6 +310,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -443,6 +448,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -475,6 +485,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -589,11 +600,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/sq.po ltsp-5.18.12/po/sq.po --- ltsp-5.18.04/po/sq.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/sq.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2016-10-29 06:02+0000\n" "Last-Translator: Besnik \n" "Language-Team: Albanian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: sq\n" #: ../common/ltsp-common-functions:194 @@ -321,6 +321,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "mos vetëzbulo formësim ndërmjetësi për apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -462,6 +467,11 @@ msgid "skip squashfs image creation" msgstr "anashkalo krijimin e pamjes squashfs" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -496,6 +506,7 @@ msgstr "Shteg për te fshehtinë chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -614,12 +625,6 @@ msgid "Set video card drivers to install" msgstr "Caktoni përudhës karte video që duhe instaluar" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" -"Numër versioni hedhjeje në qarkullim (el6,fc18,fc19) * S’funksionon ende" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -683,3 +688,8 @@ #, sh-format msgid "set the name of the chroot" msgstr "caktoni emrin e chroot-it" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "" +#~ "Numër versioni hedhjeje në qarkullim (el6,fc18,fc19) * S’funksionon ende" diff -Nru ltsp-5.18.04/po/sr.po ltsp-5.18.12/po/sr.po --- ltsp-5.18.04/po/sr.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/sr.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:44+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Serbian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/sv.po ltsp-5.18.12/po/sv.po --- ltsp-5.18.04/po/sv.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/sv.po 2018-12-25 01:13:20.000000000 +0000 @@ -8,15 +8,15 @@ msgstr "" "Project-Id-Version: ltsp_sv\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:47+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Swedish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "X-Poedit-Country: Sweden\n" "Language: sv\n" "X-Poedit-Language: Swedish\n" @@ -319,6 +319,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "lägg inte till automatisk igenkänning för inställningar av apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -456,6 +461,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -488,6 +498,7 @@ msgstr "Sökväg till chroot-skapares förhämtade filer" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -603,11 +614,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/te.po ltsp-5.18.12/po/te.po --- ltsp-5.18.04/po/te.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/te.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 16:01+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Telugu \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -309,6 +309,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -442,6 +447,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -474,6 +484,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -588,11 +599,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/tr.po ltsp-5.18.12/po/tr.po --- ltsp-5.18.04/po/tr.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/tr.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2017-12-06 08:01+0000\n" "Last-Translator: meda \n" "Language-Team: Turkish \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-12-07 04:30+0000\n" -"X-Generator: Launchpad (build 18511)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -322,6 +322,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "apt vekil yapılandırmasını otomatik algılama" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -458,6 +463,11 @@ msgid "skip squashfs image creation" msgstr "squashfs imaj oluşturumunu atla" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -490,6 +500,7 @@ msgstr "chroot-oluşturucu önbelleğinin yeri" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -609,11 +620,6 @@ msgid "Set video card drivers to install" msgstr "Kurulacak grafik kartı sürücülerini belirle" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Yayın sürüm numarası (el6,fc18,fc19) * Henüz çalışmıyor" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -675,3 +681,7 @@ #, sh-format msgid "set the name of the chroot" msgstr "chroot adını ayarla" + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Yayın sürüm numarası (el6,fc18,fc19) * Henüz çalışmıyor" diff -Nru ltsp-5.18.04/po/ug.po ltsp-5.18.12/po/ug.po --- ltsp-5.18.04/po/ug.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/ug.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:46+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Uyghur \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -310,6 +310,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -443,6 +448,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -475,6 +485,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -589,11 +600,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/uk.po ltsp-5.18.12/po/uk.po --- ltsp-5.18.04/po/uk.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/uk.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2014-09-23 10:35+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Ukrainian \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -321,6 +321,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "не визначати налаштування проксі-сервера apt у автоматичному режимі" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -464,6 +469,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -498,6 +508,7 @@ msgstr "Шлях до кешу chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -618,11 +629,6 @@ msgid "Set video card drivers to install" msgstr "Визначити драйвери відеокартки, які слід встановити" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "Номерний код випуску (el6,fc18,fc19) * Ще не працює" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" @@ -695,3 +701,7 @@ #~ msgstr "" #~ "ЗАУВАЖЕННЯ: вимикаємо джерело APT пакунків захисту для sid. Такого джерела " #~ "просто не існує." + +#, sh-format +#~ msgid "Release version number (el6,fc18,fc19) * Not working yet" +#~ msgstr "Номерний код випуску (el6,fc18,fc19) * Ще не працює" diff -Nru ltsp-5.18.04/po/vi.po ltsp-5.18.12/po/vi.po --- ltsp-5.18.04/po/vi.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/vi.po 2018-12-25 01:13:20.000000000 +0000 @@ -6,15 +6,15 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2013-01-16 15:57+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Vietnamese \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: vi\n" #: ../common/ltsp-common-functions:194 @@ -317,6 +317,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "không tự động phát hiện cấu hình ủy nhiệm apt" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -457,6 +462,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -490,6 +500,7 @@ msgstr "Đường dẫn đến vùng nhớ tạm chroot-creator" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -606,11 +617,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/zh_CN.po ltsp-5.18.12/po/zh_CN.po --- ltsp-5.18.04/po/zh_CN.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/zh_CN.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp 5.2.2\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2016-07-10 20:31+0000\n" "Last-Translator: Jim McQuillan \n" "Language-Team: Chinese (simplified) <>\n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" "Language: zh_CN\n" #: ../common/ltsp-common-functions:194 @@ -321,6 +321,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "不要自动探测 apt 代理配置" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -454,6 +459,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -486,6 +496,7 @@ msgstr "chroot-creator 缓存的路径" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -600,11 +611,6 @@ msgid "Set video card drivers to install" msgstr "" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/po/zh_TW.po ltsp-5.18.12/po/zh_TW.po --- ltsp-5.18.04/po/zh_TW.po 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/po/zh_TW.po 2018-12-25 01:13:20.000000000 +0000 @@ -7,15 +7,15 @@ msgstr "" "Project-Id-Version: ltsp\n" "Report-Msgid-Bugs-To: FULL NAME \n" -"POT-Creation-Date: 2017-11-25 19:13-0800\n" +"POT-Creation-Date: 2018-12-16 09:44+0100\n" "PO-Revision-Date: 2015-11-07 14:20+0000\n" "Last-Translator: Chao-Hsiung Liao \n" "Language-Team: Chinese (Traditional) \n" "MIME-Version: 1.0\n" "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -"X-Launchpad-Export-Date: 2017-11-27 04:30+0000\n" -"X-Generator: Launchpad (build 18509)\n" +"X-Launchpad-Export-Date: 2018-12-17 04:30+0000\n" +"X-Generator: Launchpad (build 18837)\n" #: ../common/ltsp-common-functions:194 #, sh-format @@ -311,6 +311,11 @@ msgid "do not autodetect apt proxy configuration" msgstr "不要自動偵測 apt 代理伺服器組態" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror:6 +#, sh-format +msgid "trust mirrors of file:/// type" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Debian/010-updates-mirrors:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-updates-mirrors:4 #, sh-format @@ -444,6 +449,11 @@ msgid "skip squashfs image creation" msgstr "" +#: ../server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image:5 +#, sh-format +msgid "use NFS instead of NBD as default" +msgstr "" + #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/001-set-arch:30 #: ../server/share/ltsp/plugins/ltsp-build-client/Gentoo/001-set-arch:21 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/001-set-arch:27 @@ -476,6 +486,7 @@ msgstr "" #: ../server/share/ltsp/plugins/ltsp-build-client/Fedora/010-chroot-creator:11 +#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:3 #: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/010-chroot-creator:14 #, sh-format msgid "Release version number" @@ -590,11 +601,6 @@ msgid "Set video card drivers to install" msgstr "設定要安裝的顯示卡驅動程式" -#: ../server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot:10 -#, sh-format -msgid "Release version number (el6,fc18,fc19) * Not working yet" -msgstr "" - #: ../server/share/ltsp/plugins/ltsp-build-client/SUSE_LINUX/001-load-configuration-file:3 #, sh-format msgid "Load a user specific configuration file" diff -Nru ltsp-5.18.04/release.conf ltsp-5.18.12/release.conf --- ltsp-5.18.04/release.conf 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/release.conf 2018-12-25 01:13:20.000000000 +0000 @@ -1,3 +1,3 @@ NAME=ltsp -VERSION=5.18.04 +VERSION=5.18.12 EXPORTCHANGELOG=yes diff -Nru ltsp-5.18.04/server/configs/lts.conf ltsp-5.18.12/server/configs/lts.conf --- ltsp-5.18.04/server/configs/lts.conf 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/configs/lts.conf 2018-12-25 01:13:20.000000000 +0000 @@ -35,6 +35,9 @@ # Automatically login clients with the specified LDM_USERNAME/LDM_PASSWORD. #LDM_AUTOLOGIN=True +# Map HOSTNAMEs to LDM_USERNAMEs. E.g. for HOSTNAME=pc01, LDM_USERNAME=guest01. +#HOST_TO_USERNAME="pc/guest" + # Some other frequently used directives, described in the lts.conf manpage. # For really low RAM clients, disable SOUND, LOCAL_APPS and LOCALDEV. #SOUND=False diff -Nru ltsp-5.18.04/server/configs/ltsp-server-dnsmasq.conf ltsp-5.18.12/server/configs/ltsp-server-dnsmasq.conf --- ltsp-5.18.04/server/configs/ltsp-server-dnsmasq.conf 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.18.12/server/configs/ltsp-server-dnsmasq.conf 2018-12-25 01:13:20.000000000 +0000 @@ -0,0 +1,56 @@ +# Configures dnsmasq for PXE client booting. +# All the files in /etc/dnsmasq.d/ override the main dnsmasq configuration in +# /etc/dnsmasq.conf. +# You may modify this file to suit your needs, or create new ones in dnsmasq.d/. + +# Log lots of extra information about DHCP transactions. +#log-dhcp + +# IP ranges to hand out. +dhcp-range=192.168.67.20,192.168.67.250,8h + +# If another DHCP server is present on the network, you may use a proxy range +# instead. This makes dnsmasq provide boot information but not IP leases. +# (needs dnsmasq 2.48+) +#dhcp-range=10.0.2.2,proxy + +# The rootpath option is used by both NFS and NBD. +dhcp-option=17,/opt/ltsp/i386 + +# Define common netboot types. +dhcp-vendorclass=etherboot,Etherboot +dhcp-vendorclass=pxe,PXEClient +dhcp-vendorclass=ltsp,"Linux ipconfig" + +# Set the boot filename depending on the client vendor identifier. +# The boot filename is relative to tftp-root. +dhcp-boot=net:pxe,/ltsp/i386/pxelinux.0 +dhcp-boot=net:etherboot,/ltsp/i386/nbi.img +dhcp-boot=net:ltsp,/ltsp/i386/lts.conf + +# Kill multicast. +dhcp-option=vendor:pxe,6,2b + +# Disable re-use of the DHCP servername and filename fields as extra +# option space. That's to avoid confusing some old or broken DHCP clients. +dhcp-no-override + +# We don't want a PXE menu since we're using a graphical PXELinux menu. +#pxe-prompt="Press F8 for boot menu", 3 + +# The known types are x86PC, PC98, IA64_EFI, Alpha, Arc_x86, +# Intel_Lean_Client, IA32_EFI, BC_EFI, Xscale_EFI and X86-64_EFI +pxe-service=X86PC, "Boot from network", /ltsp/i386/pxelinux + +# A boot service type of 0 is special, and will abort the +# net boot procedure and continue booting from local media. +#pxe-service=X86PC, "Boot from local hard disk", 0 + +# Comment the following to disable the TFTP server functionality of dnsmasq. +enable-tftp + +# The TFTP directory. Sometimes /srv/tftp is used instead. +tftp-root=/var/lib/tftpboot/ + +# Disable the DNS server functionality of dnsmasq by setting port=0 +port=0 diff -Nru ltsp-5.18.04/server/configs/ltsp-update-image.excludes ltsp-5.18.12/server/configs/ltsp-update-image.excludes --- ltsp-5.18.04/server/configs/ltsp-update-image.excludes 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/configs/ltsp-update-image.excludes 2018-12-25 01:13:20.000000000 +0000 @@ -1,13 +1,13 @@ cdrom/* -etc/epoptes/server.key -etc/mysql/debian.cnf -etc/NetworkManager/system-connections/* -etc/udev/rules.d/??-persistent-*.rules etc/.bzr/ +etc/_darcs +etc/epoptes/server.key etc/.etckeeper etc/.git/ etc/.hg/ -etc/_darcs +etc/mysql/debian.cnf +etc/NetworkManager/system-connections/* +etc/udev/rules.d/??-persistent-*.rules home/* lost+found/* media/* @@ -17,7 +17,9 @@ root/.* root/* run/* +snap/* srv/* +swapfile tmp/.* tmp/* var/backups/* @@ -34,6 +36,7 @@ var/log/*.1 var/log/*.gz var/log/*.old +var/log/journal/* var/mail/* var/spool/cron/atjobs/* var/spool/cron/atspool/* diff -Nru ltsp-5.18.04/server/Debian/share/ltsp/ltsp-build-client-functions ltsp-5.18.12/server/Debian/share/ltsp/ltsp-build-client-functions --- ltsp-5.18.04/server/Debian/share/ltsp/ltsp-build-client-functions 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/Debian/share/ltsp/ltsp-build-client-functions 2018-12-25 01:13:20.000000000 +0000 @@ -16,12 +16,18 @@ components="$COMPONENTS" fi - echo "deb $mirror $dist $components" >> $ROOT/etc/apt/sources.list case $mirror in - file:///*) dir=$(echo "$mirror" | sed -e 's,^file://,,g') + file:///*) + if [ "$TRUST_FILE_MIRROR" = "True" ]; then + echo "deb [trusted=yes] $mirror $dist $components" >> $ROOT/etc/apt/sources.list + fi + dir=$(echo "$mirror" | sed -e 's,^file://,,g') mkdir -p $ROOT/$dir chroot_mount $dir $dir --bind ;; + *) + echo "deb $mirror $dist $components" >> $ROOT/etc/apt/sources.list + ;; esac done } diff -Nru ltsp-5.18.04/server/doc/examples/ltsp-server-dnsmasq.conf ltsp-5.18.12/server/doc/examples/ltsp-server-dnsmasq.conf --- ltsp-5.18.04/server/doc/examples/ltsp-server-dnsmasq.conf 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/doc/examples/ltsp-server-dnsmasq.conf 1970-01-01 00:00:00.000000000 +0000 @@ -1,56 +0,0 @@ -# Configures dnsmasq for PXE client booting. -# All the files in /etc/dnsmasq.d/ override the main dnsmasq configuration in -# /etc/dnsmasq.conf. -# You may modify this file to suit your needs, or create new ones in dnsmasq.d/. - -# Log lots of extra information about DHCP transactions. -#log-dhcp - -# IP ranges to hand out. -dhcp-range=192.168.67.20,192.168.67.250,8h - -# If another DHCP server is present on the network, you may use a proxy range -# instead. This makes dnsmasq provide boot information but not IP leases. -# (needs dnsmasq 2.48+) -#dhcp-range=10.0.2.2,proxy - -# The rootpath option is used by both NFS and NBD. -dhcp-option=17,/opt/ltsp/i386 - -# Define common netboot types. -dhcp-vendorclass=etherboot,Etherboot -dhcp-vendorclass=pxe,PXEClient -dhcp-vendorclass=ltsp,"Linux ipconfig" - -# Set the boot filename depending on the client vendor identifier. -# The boot filename is relative to tftp-root. -dhcp-boot=net:pxe,/ltsp/i386/pxelinux.0 -dhcp-boot=net:etherboot,/ltsp/i386/nbi.img -dhcp-boot=net:ltsp,/ltsp/i386/lts.conf - -# Kill multicast. -dhcp-option=vendor:pxe,6,2b - -# Disable re-use of the DHCP servername and filename fields as extra -# option space. That's to avoid confusing some old or broken DHCP clients. -dhcp-no-override - -# We don't want a PXE menu since we're using a graphical PXELinux menu. -#pxe-prompt="Press F8 for boot menu", 3 - -# The known types are x86PC, PC98, IA64_EFI, Alpha, Arc_x86, -# Intel_Lean_Client, IA32_EFI, BC_EFI, Xscale_EFI and X86-64_EFI -pxe-service=X86PC, "Boot from network", /ltsp/i386/pxelinux - -# A boot service type of 0 is special, and will abort the -# net boot procedure and continue booting from local media. -#pxe-service=X86PC, "Boot from local hard disk", 0 - -# Comment the following to disable the TFTP server functionality of dnsmasq. -enable-tftp - -# The TFTP directory. Sometimes /srv/tftp is used instead. -tftp-root=/var/lib/tftpboot/ - -# Disable the DNS server functionality of dnsmasq by setting port=0 -#port=0 diff -Nru ltsp-5.18.04/server/doc/ltsp-config.8 ltsp-5.18.12/server/doc/ltsp-config.8 --- ltsp-5.18.04/server/doc/ltsp-config.8 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/doc/ltsp-config.8 2018-12-25 01:13:20.000000000 +0000 @@ -35,7 +35,7 @@ .IP "\fB\-d\fP \fB\-\-directory\fP" 18 A directory to search for configuration templates, in addition to -"/usr/share/doc/ltsp-server/examples". +"/usr/share/ltsp/examples". .IP "\fB\-h\fP \fB\-\-help\fP" 18 The application help page. diff -Nru ltsp-5.18.04/server/ltsp-config ltsp-5.18.12/server/ltsp-config --- ltsp-5.18.04/server/ltsp-config 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/ltsp-config 2018-12-25 01:13:20.000000000 +0000 @@ -28,7 +28,7 @@ Options: -d, --directory[=DIR] A directory to search for configuration templates, - in addition to /usr/share/doc/ltsp-server/examples. + in addition to /usr/share/ltsp/examples. -h, --help Displays the ltsp-config help message. -l, --language[=LANG] Preferred language for configuration files. Support varies by distribution. @@ -38,6 +38,7 @@ Tools: dnsmasq Configure dnsmasq. + --enable-dns Also enable DNS in dnsmasq, not just DHCP/TFTP. --no-proxy-dhcp Don't enable proxyDHCP mode for detected subnets. isc-dhcp-server Configure isc-dhcp-server. lts.conf Create a sample lts.conf. @@ -90,7 +91,7 @@ return 0 } -# Copy a file from /usr/share/doc/ltsp-server/examples/$1 to $2, +# Copy a file from /usr/share/ltsp/examples/$1 to $2, # uncompressing it if necessary. install_example() { local src dst dstdir language sname sext dir @@ -111,7 +112,7 @@ sext=".${src#*.}" fi LANGUAGE=${LANGUAGE:-$LANG} - for dir in "$DIRECTORY" /usr/share/doc/ltsp-server/examples; do + for dir in "$DIRECTORY" /usr/share/ltsp/examples /usr/share/doc/ltsp-server/examples; do test -d "$dir" || continue for language in "${LANGUAGE%%:*}" "${LANGUAGE%%.*}" "${LANGUAGE%%_*}" ""; do language=${language:+"-$language"} @@ -161,7 +162,40 @@ replace_line "^#dhcp-range=.*,proxy" "$proxy_lines" "$conf" fi fi - service dnsmasq restart + + if [ "$ENABLE_DNS" = "true" ]; then + sed 's/^port=0/#&/' -i "$conf" + # If systemd-resolved is running, disable it + if ss -ln sport eq 53 | grep -q 127.0.0.53; then + mkdir -p /etc/systemd/resolved.conf.d + cat >/etc/systemd/resolved.conf.d/ltsp.conf <] + +You may also name an arbitrary section with a name, with settings +underneath that section. You may then inherit that section with the +LIKE variable. The Example section has an illustration of this. + +boolean values are specified by 'Y,y,True,true' for true +and 'N,n,False,false' for false. + + +## GENERAL PARAMETERS + +*CONFIGURE_FSTAB* + boolean, default *True* + +/etc/fstab is generated by boot scripts + + +*FSTAB_0...FSTAB_9* + string, default *unset* + +Complete lines to add to /etc/fstab, for example: + + FSTAB_1="server:/home /home nfs defaults,nolock 0 0" + + +*CRONTAB_01...CRONTAB_10* + string, default *unset* + +A crontab line to add for a thin client. + + +*DNS_SERVER* + IP address, default *unset* + +A valid IP for domain name server Used to build the client's +resolv.conf file. Not needed by default. + + +*SEARCH_DOMAIN* + string, default *unset* + +sets a valid search domain in the clients's resolv.conf file. Used to +build the resolv.conf file. Not needed by default. + +Needed if DNS_SERVER is set + + +*HOSTNAME* + string, default *unset* + +This parameter sets the host name for the thin client, for situations +when if no DNS is available. A hostname is auto-generated if no +hostname is set. + + +*HOSTNAME_BASE* + string, default *ltsp* + +This parameter sets the base for the autogenerated host name for the +thin client. + + +*HOSTNAME_EXTRA* + string, default *ip* + +This parameter determines weather autogenerated host names are +appended with information based on the ip address or mac +address. Values are "ip" or "mac". + + +*NBD_SWAP* + boolean, default *False* + +Set this to True if you want to turn on NBD swap. + +If unspecified, it's automatically enabled for thin clients with less +than 300 MB RAM and for fat clients with less than 800 MB RAM. + + +*NBD_SWAP_PORT* + integer, default *10809* + +The port on which NBD swapping will occur. An nbd-server export named +swap is normally used. + + +*NBD_SWAP_SERVER* + IP address, default *SERVER* + +The NBD swap server can exist on any server on the network that is +capable of handling it. You can specify the IP address of that +server. The default is whatever the value of SERVER set to. + +*NBD_SWAP_THRESHOLD* + integer, default *300* + +Automatically enable NBD_SWAP if the client has less RAM than the +specified. For FAT clients, it defaults to 800. + + +*RM_SYSTEM_SERVICES* + string, default *unset* + +A space separated list of services that shouldn't start on the +clients even if they're installed, for example: + + RM_SYSTEM_SERVICES="apache2 dnsmasq mysql nbd-server nfs-kernel-server" + + +*RM_THIN_SYSTEM_SERVICES* + string, default *unset* + +Same as RM_SYSTEM_SERVICES, but it only affects thin clients. + + +*KEEP_SYSTEM_SERVICES* + string, default *unset* + +Some services are deleted by default when an LTSP client boots, either +to save RAM, or because they don't make sense for netbooted +machines. If you need some of them you can list them in +KEEP_SYSTEM_SERVICES, for example: + + KEEP_SYSTEM_SERVICES="acpid avahi-daemon bluetooth cups" + + +*SERVER* + IP address, default *unset* + +This is the server that is used for the XDM_SERVER, TELNET_HOST, +XFS_SERVER and SYSLOG_HOST, if any of those are not specified +explicitly. If you have one machine that is acting as the server for +everything, then you can just specify the address here and omit the +other server parameters. If this value is not set, it will be auto +detected as the machine that the thin client booted from. + + +*SYSLOG_HOST* + IP address, default *unset* + +If you want to send logging messages to a machine other than the +default server, then you can specify the machine here. If this +parameter is NOT specified, then it will use the SERVER parameter +described above. Starting from LTSP 5.4.1 and on, this parameter must +be specified to enable remote logging. + +You have to configure your server to accept remote logging as well. + +*USE_LOCAL_SWAP* + boolean, default *False* + +If you have a hard drive installed in the thin client, with a valid +swap partition on it, this parameter will allow the thin client to +swap to the local hard drive. + + +*TIMEZONE* + string, default *unset* + +The timezone code for the thin client to use. + +*TIMESERVER* + IP address, default *unset* + +The address of an NTP time server that the thin client can set it's +time from. If unset, the thin client just uses the BIOS time. + + +*SHUTDOWN_TIME* + string, format hh:mm:ss in 24 hour format, default *unset* + +Time at which thin client will automatically shut down. + + +*LTSP_FATCLIENT* + boolean, default *unset* + +Enable Fat Client support. It's automatically enabled if any sessions +exist in /usr/share/xsessions. + + +*FAT_RAM_THRESHOLD* + integer, default *300* + +Disable fat client support if less RAM is present. + + +## LOCAL DEVICES + +*LOCALDEV* + boolean, default *True* + +This parameter enables local devices support, like CD's and USB +sticks. Users plugging them in should see them on the desktop, after +they've been allowed to access the FUSE subsystem on the server. Check +your distribution's docs to see how this is done on your distribution. + + +*LOCALDEV_DENY_CD* + boolean, default *False* + +This parameter disables local device support for CD and DVD-rom +devices. + + +*LOCALDEV_DENY_FLOPPY* + boolean, default *False* + +This parameter disables local device support for floppy devices. + + +*LOCALDEV_DENY_INTERNAL_DISKS* + boolean, default *True* + +This parameter disables local device support for internal ATA and SCSI +hard disk devices. + + +*LOCALDEV_DENY_USB* + boolean, default *False* + +This parameter disables local device support for USB devices. + + +*LOCALDEV_DENY* + string, default *unset* + +This parameter disables local device support for devices matching +certain patterns. Values are specified as a comma-separated list of +sysfs attributes, which can be obtained by using udevadm info (or +udevinfo). for example: + + udevadm info -q env -n /dev/hda + ID_TYPE=disk + ID_BUS=ata + +should return a list of the attributes relevant to /dev/hda. to +exclude this disk and disks like it using LOCALDEV_DENY: +LOCALDEV_DENY="ID_BUS:ata+ID_TYPE:disk" would match devices that were +on the ata bus that were disks. + + +## SCRIPTS AND MODULES + +*MODULE_01...MODULE_10* + string, default *unset* + +Up to 10 kernel modules can be loaded by using these configuration +entries. The entire command line that you would use when running +insmod can be specified here. For example: + + MODULE_01 = uart401.o + MODULE_02 = "sb.o io=0x220 irq=5 dma=1" + MODULE_03 = opl3.o + +If the value of this parameter is an absolute path name, then insmod +will be used to load the module. Otherwise, modprobe will be used. + +In normal circumstances, you shouldn't need to specify anything here, +as most hardware will be auto-detected. + + +*RCFILE_01...RCFILE_10* + string, default *unset* + +Commands to be executed from /etc/rc.local when the client boots. + + +## PRINTER PARAMETERS + +*PRINTER_0_DEVICE* + string, default *unset* + +The device name of the printer. Valid device names such as /dev/lp0, or /dev/usb/lp0 are allowed. + + +*PRINTER_0_PORT* + integer, default 9100 + +The TCP/IP Port number to use for the print server. + + +*PRINTER_0_TYPE* + string, default *unset* + +Can either be set to P (for parallel), U (for USB) or S (for +serial). Autodetected in most cases (except for serial). + + +*PRINTER_0_WRITE_ONLY* + boolean, default *False* + +Some parallel printers may need this set in order for the thin client +to communicate to them properly. If you have problems with a parallel +printer only printing part of the print job, try setting this to True. + + +*PRINTER_0_SPEED* + integer, default *9600* + +Should be set to the baud rate of the printer (serial printers only). + + +*PRINTER_0_FLOWCTRL* + string, default *unset* + +Should be set to the flow control desired for the printer (serial +printers only). + + +*PRINTER_0_PARITY* + boolean, default *False* + +Specifies whether parity should be enabled for the printer (serial +printers only). + + +*PRINTER_0_DATABITS* + integer, default 8 + +Specifies how many data bits for the printer (serial printers only). + + +*PRINTER_0_OPTIONS* + string, default *unset* + +Specifies specific options for the printer (serial printers only). + + +*LDM_PRINTER_LIST* + string, default *unset* + +Comma separated list of printers that will be displayed for that thin +client (requires patched cups, included in Debian and Ubuntu). + + +*LDM_PRINTER_DEFAULT* + string, default *unset* + +Default printer for the thin client. + + +*SCANNER* + boolean, default *unset* + +This parameter enables scanners for the thin client. + + +## KEYBOARD PARAMETERS + +*CONSOLE_KEYMAP* + string, default *en* + +A valid console keymap. Allows you to specify a valid console keymap +for TELNET_HOST sessions. + + +*XKBLAYOUT* + string, default *unset* + +A valid xkb layout. Consult the X.org documentation for valid +settings. + + +*XKBMODEL* + string, default *unset* + +A valid xkb model. Consult the X.org documentation for valid settings. + + +*XKBVARIANT* + string, default *unset* + +A valid xkb variant. Consult the X.org documentation for valid +settings. + + +*XKBRULES* + string, default *unset* + +A valid xkb rules specifier. Consult the X.org documentation for valid +settings. + + +*XKBOPTIONS* + string, default *unset* + +A valid xkb options specifier. Consult the X.org documentation for +valid settings. + + +## TOUCHSCREEN PARAMETERS + +*USE_TOUCH* + boolean, default *unset* + +Enable touchscreen. + + X_TOUCH_DEVICE Path to device /dev/ttyS0 set device for touchscreen + X_TOUCH_DRIVER Touchscreen driver elographics set driver for touchscreen + X_TOUCH_MAXX integer 3588 Xmax + X_TOUCH_MAXY integer 3526 Ymax + X_TOUCH_MINX integer 433 Xmin + X_TOUCH_MINY integer 569 Ymin + X_TOUCH_UNDELAY integer 10 Untouch delay + X_TOUCH_RTPDELAY integer 10 Repeat touch delay + + +## SOUND AND VOLUME CONTROL PARAMETERS + +These parameters allow you to control the volume on the thin client. + +*SOUND* + boolean, default *True* + +This parameter enables sound for the thin client. + +*SOUND_DAEMON* + string, default *pulse* + +This parameter sets which sound daemon to use on the thin +client. Values are esd, nasd, and pulse (default). + +*VOLUME* + integer, default *90* + +This represents an integer percentage of the volume, ranging from 0 to +100%. + +*HEADPHONE_VOLUME* + integer, default *unset* + +This represents an integer percentage of the headphone volume, ranging +from 0 to 100%. + +*PCM_VOLUME* + integer, default *unset* + +This represents an integer percentage of the PCM volume, ranging from +0 to 100%. + +*CD_VOLUME* + integer, default *unset* + +This represents an integer percentage of the CD input volume, ranging +from 0 to 100%. + +*FRONT_VOLUME* + integer, default *unset* + +This represents an integer percentage of the front speaker volume, +ranging from 0 to 100%. + +*MIC_VOLUME* + integer, default *unset* + +This represents an integer percentage of the microphone input volume, +ranging from 0 to 100%. + + +## XORG PARAMETERS + +These parameters affect how Xorg behaves. + +*USE_XFS* + boolean, default *False* + +Instructs the thin client to look at the XFS_SERVER option, and use +XFS for serving fonts. + +*XFS_SERVER* + IP address, default *unset* + +If you are using an X Font Server to serve fonts, then you can use +this entry to specify the IP address of the host that is acting as the +font server. If this is not specified, it will use the default server, +which is specified with the SERVER entry described above. + +*CONFIGURE_X* + boolean, default *False* + +If you want to be able to configure the individual settings of the X +configuration file, without having the X automatically configure the +graphics card for you, you must enable this option. By default this +option is turned off. To turn it on do: + + CONFIGURE_X = True + +You don't need this option just for keyboard and mouse settings. It +corresponds to the graphic card and monitor options only. + +*X_CONF* + string, default *unset* + +If you want to create your own complete X.org config file, you can do +so and place it in the /opt/ltsp//etc/X11 directory. Then, +whatever you decide to call it needs to be entered as a value for this +configuration variable. For example: X_CONF = +/etc/X11/my-custom-xorg.conf Note that for the thin client, you +reference it from /etc/X11. + +*X_RAMPERC* + integer, default 100 + +Percentage of RAM for X server. Some programs allocate a large amount +of ram in the X.org server running on your thin client. Programs like +Firefox and Evince can use up so much ram, that they eventually +exhaust all your physical ram, and NBD swap, causing your thin client +to crash. If you find your clients being booted back to a login +prompt, or freezing up when viewing certain PDF's or web pages, this +may be the problem. + +The X_RAMPERC variable stands for X RAM PERCent, and is a number +between 0 and 100 that specifies how much of the free space on your +thin client X.org is allowed to consume. You'll generally want to set +it at something lower than 100 percent, if you're having +problems. Experimentation has shown a value between 80 and 90 will +usually keep the terminal alive. What will then happen is the program +consuming the memory will die, as opposed to the thin client +itself. If you're having unexplained terminal problems, specifying: + + X_RAMPERC = 80 + +in your lts.conf file may improve things. + +*X_VIRTUAL* + string, default *unset* + +If you want to have a virtual screen which is larger than the physical +screen on your thin client, you would configure that by providing a + string of the form "width height" in this parameter, similar to the +xorg.conf format. + +*XDM_SERVER* + IP address, default *unset* + +If you're using the older startx screen script, and need to specify a +different XDMCP server, then you can specify the server here. If this +parameter is NOT specified, then it will use the SERVER parameter +described above. + +*XSERVER* + string, default *unset* + +You can use this parameter to override which X server the thin client +will run. For PCI and AGP video cards, this parameter should not be +required. The thin client should normally be able to auto-detect the +card. + +If, for some reason you do need to manually set it, here are some valid values: + +ark, ati, atimisc, chips, cirrus_alpine cirrus, cirrus_laguna, cyrix, +dummy, fbdev fglrx, glint, i128, i740, i810, imstt, mga, neomagic, +newport, nsc, nv, r128, radeon, rendition, riva128, s3, s3virge, +savage, siliconmotion, sis, sisusb, tdfx, tga, trident, tseng, v4l, +vesa, vga, via, vmware, voodoo + +*X_MOUSE_DEVICE* + string, default *unset* + +This is the device node that the mouse is connected to. If it is a +serial mouse, this would be a serial port, such as /dev/ttyS0 or +/dev/ttyS1. This is not needed for PS/2 or USB mice, as they are +auto-detected. + +*X_MOUSE_PROTOCOL* + string, default *unset* + +Should be auto-detected. However, valid entries include: + +sunkbd, lkkbd, vsxxxaa, spaceorb, spaceball, magellan, warrior, +stinger, mousesystems, sunmouse, microsoft, mshack, mouseman, +intellimouse, mmwheel, iforce, h3600ts, stowawaykbd, ps2serkbd, +twiddler, twiddlerjoy + +*X_MOUSE_EMULATE3BTN* + boolean, default *unset* + +Normally unset, may need to be set to Y for certain 2 button mice. + +*X_NUMLOCK* + boolean, default *False* + +If this variable is set to True, then the numlock key will be +defaulted to on when the terminal boots. Note that the numlockx +command must be installed in the chroot for this to work. + +*X_COLOR_DEPTH* + Integer, default *unset* + +This is the number of bits to use for the colour depth. Possible +values are 8, 16, 24 and 32. 8 bits will give 256 colours, 16 will +give 65536 colours, 24 will give 16 million colours and 32 bits will +give 4.2 billion colours! Not all X servers support all of these +values. The default for thin clients is 16 in order to minimize +network bandwidth, while for fat clients the X server default is used. + +*X_SMART_COLOR_DEPTH* + boolean, default *True* + +If set, thin clients no longer default to 16 bit colour depth but use +the X server default instead. + +*X_HORZSYNC* +min-max, default *unset* + +This sets the X.org HorizSync configuration parameter. This should be +auto-detected for your monitor, however, if you want to force a lower +resolution, use this parameter to do so. + +*X_VERTREFRESH* +min-max, default *unset* + +This sets the X.org VertRefresh configuration parameter. This should +be auto-detected for your monitor. If you need to force a lower +resolution, use this parameter to do so. + +*X_VIDEO_RAM* + string, default *unset* + +This sets the X.org VideoRam configuration parameter. The setting is +in kilobytes. This should be auto-detected for your monitor. If you +need to force a different video ram setting, use this parameter to do +so. + +*X_OPTION_01...X_OPTION_12* + string, default *unset* + +A valid Device option. This allows you to specify Option settings in +the xorg.conf file, to add options to the video driver. A common use +for this will be to test turning off acceleration in your driver, if +you're having trouble. An example usage would be: + + X_OPTION_01 = "\"NoAccel\"" X_OPTION_02 = "\"AnotherOption\" \"True\"" + +You probably won't need these except in special circumstances. + +*X_MONITOR_OPTION_01...X_MONITOR_OPTION_10* + string, default *unset* + +A valid Monitor option, that would normally be used in an xorg.conf +file. + +*X_MODE_0...X_MODE_2* + string, default *unset* + +These set the X.org ModeLine configuration. For example, if your thin +client comes up in a higher resolution than what you want, say, +1280x1024, specifying: + + X_MODE_0 = 1024x768 + +should get your desired resolution on startup. + +X_MODE\_* require XRANDR_DISABLE=True to work. For drivers that +support XRANDR, the XRANDR_MODE\_* variabled are preferred. See the +XRANDR section. + +*X_BLANKING* + integer, default *unset* + +When set, X_BLANKING will cause DPMS standby to activate after the +number of seconds provided. If the monitor does not support DPMS, +then the blanking screensaver will activate. If X_BLANKING is set to +0, the monitor will remain on indefinitely. NOTE: This does not apply +to the xdmcp or startx screen script. Also, server-side Xclients such +as power managers and screensavers may override this setting. + + +## XRANDR OPTIONS + +*XRANDR_COMMAND_0...XRANDR_COMMAND_9* + string, default *unset* + +Full xrandr command to run when X starts. They're useful to define and +add custom modes, for example: + + XRANDR_COMMAND_0="xrandr --newmode 1024x600 49.00 1024 1072 1168 1312 600 603 613 624 -hsync +vsync" + XRANDR_COMMAND_1="xrandr --addmode VGA1 1024x600" + XRANDR_COMMAND_2="xrandr --output VGA1 --mode 1024x600" + +You can use cvt to find the correct timings for new modes. + +*XRANDR_DISABLE* + boolean, default *False* + +Disables XRANDR output handling so that the older X_MODE_0 way of +setting resolution works. This is useful on older Xorg drivers that +don't support XRANDR. + +*XRANDR_OUTPUT_0...XRANDR_OUTPUT_8* + string, default *unset* + +Define xrandr output - can also be used for multihead positioning + +*XRANDR_MODE_0...XRANDR_MODE_8* + string, default *unset* + +Valid video mode resolution. Sets mode for corresponding output. + +*XRANDR_NEWMODE_0...XRANDR_NEWMODE_8* + string, default *unset* + +Specifies a valid modeline for a corresponding output. + +*XRANDR_RATE_0...XRANDR_RATE_8* + string, default *unset* + +Sets refresh rate for the corresponding output. + +*XRANDR_DPI_0...XRANDR_DPI_8* + string, default *unset* + +Sets the DPI for the corresponding output. + +*XRANDR_ROTATE_0...XRANDR_ROTATE_8* + string, default *unset* + +Sets the rotation for the corresponding output. + +*XRANDR_REFLECT_0...XRANDR_REFLECT_8* + string, default *unset* + +Sets the reflection for the corresponding output. + +*XRANDR_SIZE_0...XRANDR_SIZE_8* + string, default *unset* + +Sets the resolution for the corresponding output (for xrandr <1.2). + +*XRANDR_ORIENTATION_0...XRANDR_ORIENTATION_8* + string, default *unset* + +Sets the orientation for the corresponding output (for xrandr <1.2). + + +## SCREEN SCRIPTS + +*SCREEN_01...SCREEN_12* + string, default *ldm* + +Up to 12 screen scripts can be specified for a thin client. This will +give you up to 12 sessions on the thin client, each accessible by +pressing the Ctrl-Alt-F1 through Ctrl-Alt-F12 keys. + +Currently, possible values include: kiosk, ldm, menu, rdesktop +(deprecated), shell, ssh, startx (deprecated), telnet, xdmcp, +xfreerdp, xterm + +Look in the $CHROOT/usr/share/ltsp/screen.d directory for more +scripts, or write your own, and put them there. + +*TELNET_HOST* + IP address, default *unset* + +If the thin client is setup to have a character based interface, then +the value of this parameter will be used as the host to telnet +into. If this value is NOT set, then it will use the value of SERVER +above. + + +## LDM OPTIONS + +*LDM_AUTOLOGIN* + boolean, default *False* + +This option allows the thin client to login automatically without the +need for a username and password. To set it set: + + LDM_AUTOLOGIN = True + +for the corresponding thin client. This will attempt to log in the +thin client with username = hostname and password = hostname. You can +also set a user and password with LDM_USERNAME and LDM_PASSWORD +variables. + +*LDM_DEBUG_TERMINAL* + boolean, default *False* + +Opens a local terminal after login for debugging purposes. + +*LDM_DIRECTX* + boolean, default *False* + +This is arguably the most important LDM option, as it allows you to +turn off the encrypted X tunnel via SSH, and instead run a less +secure, but much faster unencrypted tunnel. Users who have slower +thin clients will want to set this to True. It is set to True by +default in Fedora. + +*LDM_GUESTLOGIN* + boolean, default *False* + +This option places a GUEST LOGIN button underneath the entry field +for username and password. To set it set: + + LDM_GUESTLOGIN = True + +for the corresponding thin client. You can also set a user and +password with: + + LDM_USERNAME = John + +and: + + LDM_PASSWORD = secret + +although not setting these will default to the hostname of the thin client. + +*LDM_GUEST_SERVER* + string, default *unset* + +This is a space-separated list of available servers where guest +logins are available. The first server in the list will be the +default guest login server unless the user selects another from the +preferences menu at login time. + +*LDM_USER_ALLOW* + string, default *unset* + +This option allows you to give access to certain thin clients based +on the username set in /etc/passwd. For example, thin client A should +only be used by Jane, Bob, and Fred, while thin client B is to be +used by Harry only. By adding these options to the corresponding mac +addresses you allow or deny access to the thin clients in +question. Example: + + [thin:client:A:mac:address] + LDM_USER_ALLOW = Jane,Bob,Fred + [thin:client:B:mac:adddress] + LDM_USER_ALLOW = Harry + +*LDM_LOGIN_TIMEOUT* + integer + +This lets LDM automatically login after the set amount of time in +seconds. If you specify this option, then do not specify +LDM_AUTOLOGIN. Use it in this format: + + [thin:client:mac:address] + LDM_LOGIN_TIMEOUT = 25 + +Note that you will need to also set LDM_GUESTLOGIN=True for LDM_LOGIN_TIMEOUT to be useful. + +*LDM_USERNAME* + string, default *unset* + +This is the username that LDM will use for autologin. + +*LDM_PASSWORD* + string, default *unset* + +This is the password that LDM will use for autologin. + +*LDM_SYSLOG* + boolean, default *False* + +Normally, LDM logs to a simple file on the thin client, namely +/var/log/ldm.log. This has the advantage of being fast, but the +disadvantage of being hard to read for the administrator in the event +of a problem, as the administrator must either spawn a shell screen +session, or enable root login in tty1. By setting this option to +"True", you can log up to the server if you've enabled your server's +syslog for remote logging. + +*LDM_SERVER* + string, default *unset* + +This is a space-separated list of available servers for LDM to log +into. The first server in the list will be the default server unless +the user selects another from the preferences menu at login time. + +*LDM_LANGUAGE* + string, default *unset* + +This allows the system administrator to override the default locale +settings on the server by setting the environment variables LANG, +LANGUAGE and LC_ALL at login. + +Use the LANG variable to set the default locale for LDM's user +interface. + +*LDM_FORCE_LANGUAGE* + string, default *unset* + +Same as LDM_LANGUAGE, but it overrides any previously user selected +language and it even hides the LDM language selection menu. + +*LDM_SSHOPTIONS* + string, default *unset* + +Allows you to specify custom options to the ssh sessions started between LDM and the server. + +*SSH_OVERRIDE_PORT* + integer, default *unset* + +If you run your ssh server different from the default, you may set the +port the thin client will use with this parameter. + +*SSH_FOLLOW_SYMLINKS* + boolean, default *unset* + +Causes sshfs mounted filesystems for local applications to follow +symlinks. By default it's false for symlinks under $HOME and true for +any LOCAL_APPS_EXTRAMOUNTS. + +*LDM_SESSION* + string, default *unset* + +Used to chose the default session on the server, for example: + + LDM_SESSION="gnome-fallback" + +You can find the list of services that your server provides in /usr/share/xsessions. + +If the user has selected a specific session though LDM or another DM +in the past, that's stored in his ~/.dmrc, and it overrides the +default session. + +*LDM_FORCE_SESSION* + string, default *unset* + +Same as LDM_SESSION, but it overrides any previously selected +sessions by the user and it even hides the LDM session selection +menu. + +*LDM_XSESSION* + string, default *Xsession* + +Allows you to specify custom script on the server for LDM to run, +rather than the server's standard script for starting an X session +(usually Xsession). + +*LDM_LIMIT_ONE_SESSION* + boolean, default *False* + +Only allow a given user to log into one thin-client at a time. + +*LDM_LIMIT_ONE_SESSION_PROMPT* + boolean, default *False* + +Prompt to kill processes of other logins when other logins are +detected. Requires LDM_LIMIT_ONE_SESSION to be set. + +*LDM_THEME* + string, default *unset* + +Specify the name of the LDM theme. It can reference a directory in +/usr/share/ldm/themes, or be specified as a full path to the theme +dir (both relative to the chroot). + +To use the theme in /opt/ltsp/i386/usr/share/ldm/themes/MYTHEME, you'd specify: + + LDM_THEME=MYTHEME + +In your lts.conf file. + +Alternately, To use the theme in /opt/ltsp/i386/etc/MYTHEME, you'd specify: + + LDM_THEME=/etc/MYTHEME + +In your lts.conf file. + +*LDM_PASSWORD_HASH* + boolean, default *False* + +When set to True, this will create a proper shadow entry on the +client, allowing for screen locking, and other things which require +authentication to work. Note, this allows you to change your password +locally, or possibly other actions such as sudo, but these changes +are only temporary and will not persist on reboot. + +versions: LDM 2.2.14+, LTSP 5.5.2+ + + +## LOCAL APPLICATIONS + +*LOCAL_APPS* + boolean, default *True* + +Enables support for running local apps on the thin client. + +*LOCAL_APPS_EXTRAMOUNTS* + string, default *unset* + +This parameter enables extra mount points to be mounted on the thin +client with sshfs. This require a commas separated list of directory. + +*LOCAL_APPS_MENU* + boolean, default *False* + +Enables overriding of menu items from remote (server) +applications. If this is set to True, local applications in the users +menu will be used instead of the applications on the server. + +*LOCAL_APPS_MENU_ITEMS* + string, default *unset* + +This item should contain a comma separated list of application names +as they appear on their .desktop files. + +*LOCAL_APPS_WHITELIST* + string, default *unset* + +Used to allow only specified space-separated commands to be run as +local apps, allow all is default if unset. Full-paths are required +for each command. No spaces in the names are allowed. + + +## EXAMPLES + +K12LTSP + + # Global defaults for all clients + # if you refer to the local server, just use the + # "server" keyword as value + # see lts_parameters.txt for valid values + ################ + [default] + #X_COLOR_DEPTH=16 + LOCALDEV=True + SOUND=True + NBD_SWAP=True + SYSLOG_HOST=server + #XKBLAYOUT=de + SCREEN_02=shell + SCREEN_03=shell + SCREEN_04=shell + SCREEN_05=shell + SCREEN_06=shell + SCREEN_07=ldm + # LDM_DIRECTX=True allows greater scalability and performance + # Turn this off if you want greater security instead. + LDM_DIRECTX=True + # LDM_SYSLOG=True writes to server's syslog + LDM_SYSLOG=True + + ################ + # A setting stanza for an old machine + ################ + [oldmachine] + X_COLOR_DEPTH=8 + X_MODE_0=800x600 + + ################ + # Example of the LIKE variable + ################ + [01:23:DE:AD:BE:EF] + LIKE=oldmachine + SCREEN_02=shell + + ################ + #[MAC ADDRESS]: Per thin client settings + ################ + [00:11:25:84:CE:BA] + XSERVER = vesa + X_MOUSE_DEVICE=/dev/ttyS0 + X_MOUSE_PROTOCOL=intellimouse + + ############### + # A Thin Client Print server + # (switch off X by pointing tty7 to shell, + # to save resources) + ############### + [00:11:25:93:CF:00] + PRINTER_0_DEVICE=/dev/usb/lp0 + SCREEN_07=shell + + ############### + # A workstation that executes a specific + # command after login + ############### + [00:11:25:93:CF:02] + LDM_SESSION=/usr/bin/myloginscript + +## NOTES + +When using NBD to export the client image (the default in Ubuntu), lts.conf is fetched via TFTP, so lts.conf +should go in the TFTP directory, for example dvar/lib/tftpboot/ltsp/i386/lts.conf. For distributions that use +NFS, the traditional lts.conf place is /opt/ltsp/i386/etc/lts.conf, although in recent versions it can be +fetched via TFTP as well. diff -Nru ltsp-5.18.04/server/man/Makefile.am ltsp-5.18.12/server/man/Makefile.am --- ltsp-5.18.04/server/man/Makefile.am 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/man/Makefile.am 2018-12-25 01:13:20.000000000 +0000 @@ -1,6 +1,6 @@ dist_man_MANS = ltsp-chroot.8 ltsp-config.8 ltsp-info.1 \ ltsp-update-image.8 ltsp-update-kernels.8 ltsp-update-sshkeys.8 \ - ltsp-build-client.8 + ltsp-build-client.8 lts.conf.5 H2M_COMMON_FLAGS = -N --include="include/common.h2m" ltsp-build-client.8: ../ltsp-build-client @@ -44,3 +44,6 @@ -s 8 $(H2M_COMMON_FLAGS) --include="include/ltsp-update-sshkeys.h2m" \ --name="update LTSP chroots to trust the server ssh keys" \ ../ltsp-update-sshkeys + +lts.conf.5: + go-md2man -in=lts.conf.5.md -out=lts.conf.5 diff -Nru ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration --- ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Debian/000-basic-configuration 2018-12-25 01:13:20.000000000 +0000 @@ -2,7 +2,7 @@ configure) ARCH=${ARCH:-"$(dpkg --print-architecture)"} APT_GET_OPTS=${APT_GET_OPTS:-"-y"} - DIST=${DIST:-"$(lsb_release -s -c)"} + DIST=${DIST:-"$(cat /etc/debian_version | cut -d'/' -f1)"} MIRROR=${MIRROR:-"http://deb.debian.org/debian"} COMPONENTS=${COMPONENTS:-"main"} EARLY_PACKAGES=${EARLY_PACKAGES:-"ltsp-client"} diff -Nru ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Debian/010-debootstrap ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Debian/010-debootstrap --- ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Debian/010-debootstrap 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Debian/010-debootstrap 2018-12-25 01:13:20.000000000 +0000 @@ -30,6 +30,7 @@ echo " $0 --dist etch" exit 1 fi + # Install base packages LC_ALL=C ${DEBOOTSTRAP:-"debootstrap"} $DEBOOTSTRAPOPTS --arch $ARCH $DIST $ROOT $MIRROR if [ -x "$CROSS_ARCH_EMULATOR" ]; then diff -Nru ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror --- ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Debian/010-manage-mirror 2018-12-25 01:13:20.000000000 +0000 @@ -3,6 +3,7 @@ add_option "mirror" "`eval_gettext "set the mirror location"`" "regular" "true" add_option "early-mirror" "`eval_gettext "add a mirror, which takes priority over the default mirror"`" "advanced" "true" add_option "extra-mirror" "`eval_gettext "add a mirror, with lower priority than the default mirror"`" "advanced" "true" + add_option "trust-file-mirror" "`eval_gettext "trust mirrors of file:/// type"`" "advanced" "false" ;; configure) if [ -n "$option_mirror_value" ]; then @@ -14,6 +15,11 @@ if [ -n "$option_extra_mirror_value" ]; then EXTRA_MIRROR="$option_extra_mirror_value" fi + if [ -n "$option_trust_file_mirror_value" ]; then + # Option to enable trusted file mirrors: + # https://bugs.debian.org/911380 + TRUST_FILE_MIRROR=True + fi ;; after-install) sources_list="$ROOT/etc/apt/sources.list" diff -Nru ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image --- ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Debian/095-squashfs-image 2018-12-25 01:13:20.000000000 +0000 @@ -1,7 +1,8 @@ case "$MODE" in commandline) add_option "squashfs-image" "`eval_gettext "create squashfs image for use with NBD"`" "advanced" "false" - add_option "no-squashfs-image" "`eval_gettext "skip squashfs image creation"`" "advanced" "false" + add_option "no-squashfs-image" "`eval_gettext "skip squashfs image creation"`" "advanced" "false" + add_option "nfs-root" "`eval_gettext "use NFS instead of NBD as default"`" "advanced" "false" ;; configure) if [ -n "$option_squashfs_image_value" ]; then @@ -12,9 +13,19 @@ # set an environment variable we can pick up later SQUASHFS_IMAGE="False" fi + if [ -n "$option_nfs_root_value" ]; then + # set an environment variable we can pick up later + NFS_ROOT="True" + fi if [ -z "$SQUASHFS_IMAGE" ]; then - SQUASHFS_IMAGE="True" - fi + SQUASHFS_IMAGE="True" + fi + ;; + after-install) + if [ "True" = "$NFS_ROOT" ]; then + mkdir -p $ROOT/etc/ltsp/update-kernels.conf.d + echo 'BOOT_METHODS="NFS NBD AOE"' > $ROOT/etc/ltsp/update-kernels.conf.d/nfs + fi ;; finalization) if [ "True" = "$SQUASHFS_IMAGE" ]; then diff -Nru ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot --- ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Redhat/009-mock-chroot 2018-12-25 01:13:20.000000000 +0000 @@ -1,7 +1,3 @@ -#!/bin/sh - -set -x - case "${MODE}" in commandline) add_option "release" "`eval_gettext "Release version number"`" "advanced" "true" diff -Nru ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-debootstrap ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-debootstrap --- ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-debootstrap 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-debootstrap 2018-12-25 01:13:20.000000000 +0000 @@ -30,6 +30,7 @@ echo " $0 --dist etch" exit 1 fi + # Install base packages LC_ALL=C ${DEBOOTSTRAP:-"debootstrap"} $DEBOOTSTRAPOPTS --arch $ARCH $DIST $ROOT $MIRROR if [ -x "$CROSS_ARCH_EMULATOR" ]; then diff -Nru ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-manage-mirror ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-manage-mirror --- ltsp-5.18.04/server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-manage-mirror 2018-04-24 00:43:36.000000000 +0000 +++ ltsp-5.18.12/server/share/ltsp/plugins/ltsp-build-client/Ubuntu/010-manage-mirror 2018-12-25 01:13:20.000000000 +0000 @@ -3,6 +3,7 @@ add_option "mirror" "`eval_gettext "set the mirror location"`" "regular" "true" add_option "early-mirror" "`eval_gettext "add a mirror, which takes priority over the default mirror"`" "advanced" "true" add_option "extra-mirror" "`eval_gettext "add a mirror, with lower priority than the default mirror"`" "advanced" "true" + add_option "trust-file-mirror" "`eval_gettext "trust mirrors of file:/// type"`" "advanced" "false" ;; configure) if [ -n "$option_mirror_value" ]; then @@ -14,6 +15,11 @@ if [ -n "$option_extra_mirror_value" ]; then EXTRA_MIRROR="$option_extra_mirror_value" fi + if [ -n "$option_trust_file_mirror_value" ]; then + # Option to enable trusted file mirrors: + # https://bugs.debian.org/911380 + TRUST_FILE_MIRROR=True + fi ;; after-install) sources_list="$ROOT/etc/apt/sources.list"