# HG changeset patch # User Aleksej Bobylev # Date 1427747565 -10800 # Node ID 6a623c8ee24c6dedae20d43b99dba029db3970a0 # Parent d8259c857aeaa45fb24dc18d2b5eaa98a950fe62 Fix TazPanel Install menu; fix 'critical error' in po file; force to make link in makefile. diff -r d8259c857aea -r 6a623c8ee24c Makefile --- a/Makefile Mon Mar 30 16:38:23 2015 +0200 +++ b/Makefile Mon Mar 30 23:32:45 2015 +0300 @@ -81,7 +81,7 @@ install -m 0755 installer.cgi $(DESTDIR)$(TAZPANEL) -[ "$(VERSION)" ] && sed -i 's/^VERSION=["0-9].*/VERSION="$(VERSION)"/' $(DESTDIR)$(TAZPANEL)/installer.cgi @echo "Installing installer.menu into $(DESTDIR)$(TAZPANEL)/menu.d..." - ln -s ../installer.cgi $(DESTDIR)$(TAZPANEL)/menu.d/installer.cgi + ln -fs ../installer.cgi $(DESTDIR)$(TAZPANEL)/menu.d/installer.cgi @echo "Installing config file into $(DESTDIR)/etc/slitaz..." mkdir -p $(DESTDIR)/etc/slitaz install -m 0755 etc/tazinst.conf $(DESTDIR)/etc/slitaz diff -r d8259c857aea -r 6a623c8ee24c installer.cgi --- a/installer.cgi Mon Mar 30 16:38:23 2015 +0200 +++ b/installer.cgi Mon Mar 30 23:32:45 2015 +0300 @@ -42,9 +42,9 @@
  • $(gettext 'Install')
  • $(gettext 'Install SliTaz')
  • + href="/installer.cgi?page=install">$(gettext 'Install SliTaz')
  • $(gettext 'Upgrade system')
  • + href="/installer.cgi?page=upgrade">$(gettext 'Upgrade system') EOT diff -r d8259c857aea -r 6a623c8ee24c po/installer/fr.po --- a/po/installer/fr.po Mon Mar 30 16:38:23 2015 +0200 +++ b/po/installer/fr.po Mon Mar 30 23:32:45 2015 +0300 @@ -177,7 +177,6 @@ #: installer.cgi:135 msgid "Launch GParted, the partition editor tool" -msgstr "" msgstr "Lance GParted, l'éditeur de partition" #: installer.cgi:136 @@ -251,7 +250,6 @@ #: installer.cgi:252 msgid "Specify the partition where to install SliTaz" -msgstr "" msgstr "Entrez la partition où installer SliTaz" #: installer.cgi:276