diff -Nru ltsp-5.3.2/debian/changelog ltsp-5.3.2/debian/changelog --- ltsp-5.3.2/debian/changelog 2012-02-27 19:38:06.000000000 +0000 +++ ltsp-5.3.2/debian/changelog 2012-03-01 15:37:12.000000000 +0000 @@ -1,3 +1,12 @@ +ltsp (5.3.2-0ubuntu3) precise; urgency=low + + * ltsp-live: + - Add translation of .desktop file + - Refresh translation template + - Update french translations + + -- Stéphane Graber Thu, 01 Mar 2012 10:36:41 -0500 + ltsp (5.3.2-0ubuntu2) precise; urgency=low * ltsp-live: Don't crash when no network interface is available. diff -Nru ltsp-5.3.2/debian/scripts/ltsp-live.desktop ltsp-5.3.2/debian/scripts/ltsp-live.desktop --- ltsp-5.3.2/debian/scripts/ltsp-live.desktop 2012-02-27 17:58:33.000000000 +0000 +++ ltsp-5.3.2/debian/scripts/ltsp-live.desktop 2012-03-01 15:35:31.000000000 +0000 @@ -1,7 +1,10 @@ - [Desktop Entry] +Version=1.0 Icon=ltsp-live.png Type=Application +StartupNotify=false Exec=gksudo ltsp-live -Name=Start LTSP Live -Comment=Starts an LTSP LiveCD Session +Name=Start LTSP-Live +Comment=Starts an LTSP server from the live CD +Categories=GNOME;KDE;System; +X-Ubuntu-Gettext-Domain=ltsp-livecd diff -Nru ltsp-5.3.2/debian/scripts/po/extract-desktop.sh ltsp-5.3.2/debian/scripts/po/extract-desktop.sh --- ltsp-5.3.2/debian/scripts/po/extract-desktop.sh 1970-01-01 00:00:00.000000000 +0000 +++ ltsp-5.3.2/debian/scripts/po/extract-desktop.sh 2012-03-01 15:31:33.000000000 +0000 @@ -0,0 +1,9 @@ +#!/bin/sh +egrep "^Name|Comment" $1 | sed -e "s/^Name=//" -e "s/Comment=//" | while read line; do + ( + echo "" + echo "#: $1" + echo "msgid \"$line\"" + echo "msgstr \"\"" + ) >> $2 +done diff -Nru ltsp-5.3.2/debian/scripts/po/fr.po ltsp-5.3.2/debian/scripts/po/fr.po --- ltsp-5.3.2/debian/scripts/po/fr.po 2012-02-27 17:58:33.000000000 +0000 +++ ltsp-5.3.2/debian/scripts/po/fr.po 2012-03-01 15:36:13.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-24 16:45-0400\n" +"POT-Creation-Date: 2012-03-01 10:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,31 +16,79 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: ../ltsp-live:40 -msgid "Creating new configuration file" -msgstr "Création d'un nouveau fichier de configuration" - -#: ../ltsp-live:42 +#: ../ltsp-live:44 msgid "Unable to parse config" msgstr "Impossible d'analyser la configuration" -#: ../ltsp-live:78 -msgid "Failed to enable LTSP: %s" -msgstr "Impossible de configurer LTSP: %s" - -#: ../ltsp-live:92 -msgid "Failed to list network cards: %s" -msgstr "Impossible de lister les cartes réseaux: %s" - -#: ../ltsp-live:205 -msgid "Unable to find .xml UI file" -msgstr "Fichier .xml d'interface graphique introuvable" +#: ../ltsp-live:105 +msgid "Restarting Network Manager" +msgstr "Redémarrage de Network Manager" + +#: ../ltsp-live:112 +msgid "Adding LTSP network to Network Manager" +msgstr "Ajout du réseau LTSP à Network Manager" + +#: ../ltsp-live:117 +msgid "Enabling LTSP network in Network Manager" +msgstr "Activation du réseau LTSP dans Network Manager" + +#: ../ltsp-live:120 ../ltsp-live:336 +msgid "Failed" +msgstr "Echec" + +#: ../ltsp-live:124 +msgid "Installing the required packages" +msgstr "Installation des paquets réquis" + +#: ../ltsp-live:130 +msgid "Starting OpenSSH server" +msgstr "Démarrage du serveur OpenSSH" + +#: ../ltsp-live:139 +msgid "Restarting openbsd-inetd" +msgstr "Redémarrage de openbsd-inetd" + +#: ../ltsp-live:145 +msgid "Configuring LTSP" +msgstr "Configuration de LTSP" + +#: ../ltsp-live:173 +msgid "Creating the guest users" +msgstr "Creation des comptes invités" + +#: ../ltsp-live:184 +msgid "Configuring DNSmasq" +msgstr "Configuration de DNSmasq" + +#: ../ltsp-live:203 +msgid "Starting DNSmasq" +msgstr "Démarrage de DNSmasq" + +#: ../ltsp-live:209 +msgid "Extracting thin client kernel and initrd" +msgstr "Extraction du noyau et de l'initrd" + +#: ../ltsp-live:230 +msgid "Starting NBD server" +msgstr "Démarrage du serveur NBD" + +#: ../ltsp-live:235 ../ltsp-live:326 +msgid "Ready" +msgstr "Prêt" -#: ../ltsp-live:244 +#: ../ltsp-live:289 msgid "None" msgstr "Aucune" -#: ../ltsp-live:282 +#: ../ltsp-live:331 +msgid "LTSP-Live should now be ready to use!" +msgstr "LTSP-Live devrait maintenant être prêt à l'emploit!" + +#: ../ltsp-live:341 +msgid "Unable to configure Network Manager" +msgstr "Impossible de configurer Network Manager" + +#: ../ltsp-live:361 msgid "" "The selected network interface is already in use.\n" "Are you sure you want to use it?" @@ -50,7 +98,7 @@ #: ../ltsp-live.xml:6 msgid "LTSP-Live configuration" -msgstr "Configure de LTSP-Live" +msgstr "Configuration de LTSP-Live" #: ../ltsp-live.xml:21 msgid "" @@ -62,4 +110,16 @@ #: ../ltsp-live.xml:41 msgid "Network devices" -msgstr "Carte réseaux" +msgstr "Cartes réseaux" + +#: ../ltsp-live.xml:86 +msgid "Status" +msgstr "Statut" + +#: ../ltsp-live.desktop +msgid "Start LTSP-Live" +msgstr "Démarrer LTSP-Live" + +#: ../ltsp-live.desktop +msgid "Starts an LTSP server from the live CD" +msgstr "Démarre un serveur LTSP depuis le live CD" diff -Nru ltsp-5.3.2/debian/scripts/po/ltsp-live.pot ltsp-5.3.2/debian/scripts/po/ltsp-live.pot --- ltsp-5.3.2/debian/scripts/po/ltsp-live.pot 2012-02-27 17:58:33.000000000 +0000 +++ ltsp-5.3.2/debian/scripts/po/ltsp-live.pot 2012-03-01 15:35:39.000000000 +0000 @@ -7,7 +7,7 @@ msgstr "" "Project-Id-Version: PACKAGE VERSION\n" "Report-Msgid-Bugs-To: \n" -"POT-Creation-Date: 2011-08-24 16:45-0400\n" +"POT-Creation-Date: 2012-03-01 10:35-0500\n" "PO-Revision-Date: YEAR-MO-DA HO:MI+ZONE\n" "Last-Translator: FULL NAME \n" "Language-Team: LANGUAGE \n" @@ -16,31 +16,79 @@ "Content-Type: text/plain; charset=CHARSET\n" "Content-Transfer-Encoding: 8bit\n" -#: ../ltsp-live:40 -msgid "Creating new configuration file" +#: ../ltsp-live:44 +msgid "Unable to parse config" msgstr "" -#: ../ltsp-live:42 -msgid "Unable to parse config" +#: ../ltsp-live:105 +msgid "Restarting Network Manager" +msgstr "" + +#: ../ltsp-live:112 +msgid "Adding LTSP network to Network Manager" +msgstr "" + +#: ../ltsp-live:117 +msgid "Enabling LTSP network in Network Manager" +msgstr "" + +#: ../ltsp-live:120 ../ltsp-live:336 +msgid "Failed" +msgstr "" + +#: ../ltsp-live:124 +msgid "Installing the required packages" +msgstr "" + +#: ../ltsp-live:130 +msgid "Starting OpenSSH server" +msgstr "" + +#: ../ltsp-live:139 +msgid "Restarting openbsd-inetd" +msgstr "" + +#: ../ltsp-live:145 +msgid "Configuring LTSP" msgstr "" -#: ../ltsp-live:78 -msgid "Failed to enable LTSP: %s" +#: ../ltsp-live:173 +msgid "Creating the guest users" msgstr "" -#: ../ltsp-live:92 -msgid "Failed to list network cards: %s" +#: ../ltsp-live:184 +msgid "Configuring DNSmasq" msgstr "" -#: ../ltsp-live:205 -msgid "Unable to find .xml UI file" +#: ../ltsp-live:203 +msgid "Starting DNSmasq" msgstr "" -#: ../ltsp-live:244 +#: ../ltsp-live:209 +msgid "Extracting thin client kernel and initrd" +msgstr "" + +#: ../ltsp-live:230 +msgid "Starting NBD server" +msgstr "" + +#: ../ltsp-live:235 ../ltsp-live:326 +msgid "Ready" +msgstr "" + +#: ../ltsp-live:289 msgid "None" msgstr "" -#: ../ltsp-live:282 +#: ../ltsp-live:331 +msgid "LTSP-Live should now be ready to use!" +msgstr "" + +#: ../ltsp-live:341 +msgid "Unable to configure Network Manager" +msgstr "" + +#: ../ltsp-live:361 msgid "" "The selected network interface is already in use.\n" "Are you sure you want to use it?" @@ -59,3 +107,15 @@ #: ../ltsp-live.xml:41 msgid "Network devices" msgstr "" + +#: ../ltsp-live.xml:86 +msgid "Status" +msgstr "" + +#: ../ltsp-live.desktop +msgid "Start LTSP-Live" +msgstr "" + +#: ../ltsp-live.desktop +msgid "Starts an LTSP server from the live CD" +msgstr "" diff -Nru ltsp-5.3.2/debian/scripts/po/Makefile ltsp-5.3.2/debian/scripts/po/Makefile --- ltsp-5.3.2/debian/scripts/po/Makefile 2012-02-27 17:58:33.000000000 +0000 +++ ltsp-5.3.2/debian/scripts/po/Makefile 2012-03-01 15:29:54.000000000 +0000 @@ -13,6 +13,7 @@ $(DOMAIN).pot: pygettext -d $(DOMAIN) -a -D ../ltsp-live xgettext -L glade -o $(DOMAIN).pot -j ../ltsp-live.xml + sh extract-desktop.sh ../ltsp-live.desktop ltsp-live.pot sed "/#, fuzzy/d" -i ltsp-live.pot update-po: