tazinst rev 49

Fix TazPanel Install menu; fix 'critical error' in po file; force to make link in makefile.
author Aleksej Bobylev <al.bobylev@gmail.com>
date Mon Mar 30 23:32:45 2015 +0300 (2015-03-30)
parents d8259c857aea
children f0b248dc7e0c
files Makefile installer.cgi po/installer/fr.po
line diff
     1.1 --- a/Makefile	Mon Mar 30 16:38:23 2015 +0200
     1.2 +++ b/Makefile	Mon Mar 30 23:32:45 2015 +0300
     1.3 @@ -81,7 +81,7 @@
     1.4  	install -m 0755 installer.cgi $(DESTDIR)$(TAZPANEL)
     1.5  	-[ "$(VERSION)" ] && sed -i 's/^VERSION=["0-9].*/VERSION="$(VERSION)"/' $(DESTDIR)$(TAZPANEL)/installer.cgi
     1.6  	@echo "Installing installer.menu into $(DESTDIR)$(TAZPANEL)/menu.d..."
     1.7 -	ln -s ../installer.cgi $(DESTDIR)$(TAZPANEL)/menu.d/installer.cgi
     1.8 +	ln -fs ../installer.cgi $(DESTDIR)$(TAZPANEL)/menu.d/installer.cgi
     1.9  	@echo "Installing config file into $(DESTDIR)/etc/slitaz..."
    1.10  	mkdir -p $(DESTDIR)/etc/slitaz
    1.11  	install -m 0755 etc/tazinst.conf $(DESTDIR)/etc/slitaz

     2.1 --- a/installer.cgi	Mon Mar 30 16:38:23 2015 +0200
     2.2 +++ b/installer.cgi	Mon Mar 30 23:32:45 2015 +0300
     2.3 @@ -42,9 +42,9 @@
     2.4  		<li><a data-icon="install"
     2.5  			href="/installer.cgi">$(gettext 'Install')</a></li>
     2.6  		<li><a data-icon="slitaz"
     2.7 -			href="/installer.cgi?page=menu_install">$(gettext 'Install SliTaz')</a></li>
     2.8 +			href="/installer.cgi?page=install">$(gettext 'Install SliTaz')</a></li>
     2.9  		<li><a data-icon="upgrade"
    2.10 -			href="/installer.cgi?page=menu_upgrade">$(gettext 'Upgrade system')</a></li>
    2.11 +			href="/installer.cgi?page=upgrade">$(gettext 'Upgrade system')</a></li>
    2.12  	</menu>
    2.13  </li>
    2.14  EOT

     3.1 --- a/po/installer/fr.po	Mon Mar 30 16:38:23 2015 +0200
     3.2 +++ b/po/installer/fr.po	Mon Mar 30 23:32:45 2015 +0300
     3.3 @@ -177,7 +177,6 @@
     3.4  
     3.5  #: installer.cgi:135
     3.6  msgid "Launch GParted, the partition editor tool"
     3.7 -msgstr ""
     3.8  msgstr "Lance GParted, l'éditeur de partition"
     3.9  
    3.10  #: installer.cgi:136
    3.11 @@ -251,7 +250,6 @@
    3.12  
    3.13  #: installer.cgi:252
    3.14  msgid "Specify the partition where to install SliTaz"
    3.15 -msgstr ""
    3.16  msgstr "Entrez la partition où installer SliTaz"
    3.17  
    3.18  #: installer.cgi:276