From: <cod...@go...> - 2009-04-03 19:10:35
|
Author: M0...@gm... Date: Fri Apr 3 12:05:14 2009 New Revision: 526 Modified: branches/speedy/.lang/#project.pot branches/speedy/.lang/.pot branches/speedy/.lang/ClsFstab.pot branches/speedy/.lang/ClsGlobal.pot branches/speedy/.lang/Conf0.pot branches/speedy/.lang/FMain.pot branches/speedy/.lang/FMain0.pot branches/speedy/.lang/MdlAutoPartition.pot branches/speedy/.lang/MdlBootMngr.pot branches/speedy/.lang/MdlHelpSystem.pot branches/speedy/.lang/MdlMain.pot branches/speedy/.lang/MdlStartUp.pot branches/speedy/.lang/Step0.pot branches/speedy/.lang/Step1.pot branches/speedy/.lang/Step2.pot branches/speedy/.lang/Step3.pot branches/speedy/.lang/Step3a.pot branches/speedy/.lang/Step3a1.pot branches/speedy/.lang/Step3a1a.pot branches/speedy/.lang/Step3a2.pot branches/speedy/.lang/Step3a3.pot branches/speedy/.lang/Step3a3a.pot branches/speedy/.lang/Step4.pot branches/speedy/.lang/Step5.pot branches/speedy/.lang/Step6.pot branches/speedy/.lang/Step7.pot branches/speedy/.lang/Step7a.pot branches/speedy/.lang/Step7b.pot branches/speedy/.lang/Step8.pot branches/speedy/MdlBootMngr.module Log: Added more distro ids Modified: branches/speedy/.lang/#project.pot ============================================================================== --- branches/speedy/.lang/#project.pot (original) +++ branches/speedy/.lang/#project.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/.project +# /home/lightuser/devel/speedy/.project # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/.pot ============================================================================== --- branches/speedy/.lang/.pot (original) +++ branches/speedy/.lang/.pot Fri Apr 3 12:05:14 2009 @@ -163,31 +163,31 @@ msgid "Select the location to which we will resize" msgstr "" -#: MdlBootMngr.module:119 +#: MdlBootMngr.module:159 msgid "Installation found in" msgstr "" -#: MdlBootMngr.module:137 +#: MdlBootMngr.module:177 msgid "Include in boot menu" msgstr "" -#: MdlBootMngr.module:157 +#: MdlBootMngr.module:197 msgid "Name" msgstr "" -#: MdlBootMngr.module:175 +#: MdlBootMngr.module:215 msgid "Initial RAM disk image" msgstr "" -#: MdlBootMngr.module:198 +#: MdlBootMngr.module:238 msgid "Kernel boot options" msgstr "" -#: MdlBootMngr.module:224 +#: MdlBootMngr.module:264 msgid "Add option to boot this operating system into text mode" msgstr "" -#: MdlBootMngr.module:318 +#: MdlBootMngr.module:358 msgid "None" msgstr "" Modified: branches/speedy/.lang/ClsFstab.pot ============================================================================== --- branches/speedy/.lang/ClsFstab.pot (original) +++ branches/speedy/.lang/ClsFstab.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/ClsFstab.class +# /home/lightuser/devel/speedy/ClsFstab.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/ClsGlobal.pot ============================================================================== --- branches/speedy/.lang/ClsGlobal.pot (original) +++ branches/speedy/.lang/ClsGlobal.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/ClsGlobal.class +# /home/lightuser/devel/speedy/ClsGlobal.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Conf0.pot ============================================================================== --- branches/speedy/.lang/Conf0.pot (original) +++ branches/speedy/.lang/Conf0.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Conf0.class +# /home/lightuser/devel/speedy/Conf0.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/FMain.pot ============================================================================== --- branches/speedy/.lang/FMain.pot (original) +++ branches/speedy/.lang/FMain.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/FMain.class +# /home/lightuser/devel/speedy/FMain.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/FMain0.pot ============================================================================== --- branches/speedy/.lang/FMain0.pot (original) +++ branches/speedy/.lang/FMain0.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/FMain0.class +# /home/lightuser/devel/speedy/FMain0.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/MdlAutoPartition.pot ============================================================================== --- branches/speedy/.lang/MdlAutoPartition.pot (original) +++ branches/speedy/.lang/MdlAutoPartition.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/MdlAutoPartition.module +# /home/lightuser/devel/speedy/MdlAutoPartition.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/MdlBootMngr.pot ============================================================================== --- branches/speedy/.lang/MdlBootMngr.pot (original) +++ branches/speedy/.lang/MdlBootMngr.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/MdlBootMngr.module +# /home/lightuser/devel/speedy/MdlBootMngr.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. @@ -14,31 +14,31 @@ "Content-Type: text/plain; charset=UTF-8\n" "Content-Transfer-Encoding: 8bit\n" -#: MdlBootMngr.module:119 +#: MdlBootMngr.module:159 msgid "Installation found in" msgstr "" -#: MdlBootMngr.module:137 +#: MdlBootMngr.module:177 msgid "Include in boot menu" msgstr "" -#: MdlBootMngr.module:157 +#: MdlBootMngr.module:197 msgid "Name" msgstr "" -#: MdlBootMngr.module:175 +#: MdlBootMngr.module:215 msgid "Initial RAM disk image" msgstr "" -#: MdlBootMngr.module:198 +#: MdlBootMngr.module:238 msgid "Kernel boot options" msgstr "" -#: MdlBootMngr.module:224 +#: MdlBootMngr.module:264 msgid "Add option to boot this operating system into text mode" msgstr "" -#: MdlBootMngr.module:318 +#: MdlBootMngr.module:358 msgid "None" msgstr "" Modified: branches/speedy/.lang/MdlHelpSystem.pot ============================================================================== --- branches/speedy/.lang/MdlHelpSystem.pot (original) +++ branches/speedy/.lang/MdlHelpSystem.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/MdlHelpSystem.module +# /home/lightuser/devel/speedy/MdlHelpSystem.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/MdlMain.pot ============================================================================== --- branches/speedy/.lang/MdlMain.pot (original) +++ branches/speedy/.lang/MdlMain.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/MdlMain.module +# /home/lightuser/devel/speedy/MdlMain.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/MdlStartUp.pot ============================================================================== --- branches/speedy/.lang/MdlStartUp.pot (original) +++ branches/speedy/.lang/MdlStartUp.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/MdlStartUp.module +# /home/lightuser/devel/speedy/MdlStartUp.module # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step0.pot ============================================================================== --- branches/speedy/.lang/Step0.pot (original) +++ branches/speedy/.lang/Step0.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step0.class +# /home/lightuser/devel/speedy/Step0.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step1.pot ============================================================================== --- branches/speedy/.lang/Step1.pot (original) +++ branches/speedy/.lang/Step1.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step1.class +# /home/lightuser/devel/speedy/Step1.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step2.pot ============================================================================== --- branches/speedy/.lang/Step2.pot (original) +++ branches/speedy/.lang/Step2.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step2.class +# /home/lightuser/devel/speedy/Step2.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step3.pot ============================================================================== --- branches/speedy/.lang/Step3.pot (original) +++ branches/speedy/.lang/Step3.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step3.class +# /home/lightuser/devel/speedy/Step3.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step3a.pot ============================================================================== --- branches/speedy/.lang/Step3a.pot (original) +++ branches/speedy/.lang/Step3a.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step3a.class +# /home/lightuser/devel/speedy/Step3a.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step3a1.pot ============================================================================== --- branches/speedy/.lang/Step3a1.pot (original) +++ branches/speedy/.lang/Step3a1.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step3a1.class +# /home/lightuser/devel/speedy/Step3a1.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step3a1a.pot ============================================================================== --- branches/speedy/.lang/Step3a1a.pot (original) +++ branches/speedy/.lang/Step3a1a.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step3a1a.class +# /home/lightuser/devel/speedy/Step3a1a.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step3a2.pot ============================================================================== --- branches/speedy/.lang/Step3a2.pot (original) +++ branches/speedy/.lang/Step3a2.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step3a2.class +# /home/lightuser/devel/speedy/Step3a2.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step3a3.pot ============================================================================== --- branches/speedy/.lang/Step3a3.pot (original) +++ branches/speedy/.lang/Step3a3.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step3a3.class +# /home/lightuser/devel/speedy/Step3a3.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step3a3a.pot ============================================================================== --- branches/speedy/.lang/Step3a3a.pot (original) +++ branches/speedy/.lang/Step3a3a.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step3a3a.class +# /home/lightuser/devel/speedy/Step3a3a.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step4.pot ============================================================================== --- branches/speedy/.lang/Step4.pot (original) +++ branches/speedy/.lang/Step4.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step4.class +# /home/lightuser/devel/speedy/Step4.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step5.pot ============================================================================== --- branches/speedy/.lang/Step5.pot (original) +++ branches/speedy/.lang/Step5.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step5.class +# /home/lightuser/devel/speedy/Step5.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step6.pot ============================================================================== --- branches/speedy/.lang/Step6.pot (original) +++ branches/speedy/.lang/Step6.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step6.class +# /home/lightuser/devel/speedy/Step6.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step7.pot ============================================================================== --- branches/speedy/.lang/Step7.pot (original) +++ branches/speedy/.lang/Step7.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step7.class +# /home/lightuser/devel/speedy/Step7.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step7a.pot ============================================================================== --- branches/speedy/.lang/Step7a.pot (original) +++ branches/speedy/.lang/Step7a.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step7a.class +# /home/lightuser/devel/speedy/Step7a.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step7b.pot ============================================================================== --- branches/speedy/.lang/Step7b.pot (original) +++ branches/speedy/.lang/Step7b.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step7b.class +# /home/lightuser/devel/speedy/Step7b.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/.lang/Step8.pot ============================================================================== --- branches/speedy/.lang/Step8.pot (original) +++ branches/speedy/.lang/Step8.pot Fri Apr 3 12:05:14 2009 @@ -1,4 +1,4 @@ -# /home/vluser/devel/speedy/Step8.class +# /home/lightuser/devel/speedy/Step8.class # Generated by Gambas compiler # FIRST AUTHOR <EMAIL@ADDRESS>, YEAR. Modified: branches/speedy/MdlBootMngr.module ============================================================================== --- branches/speedy/MdlBootMngr.module (original) +++ branches/speedy/MdlBootMngr.module Fri Apr 3 12:05:14 2009 @@ -26,14 +26,12 @@ PUBLIC FUNCTION ID_LINUX(sMountedLocation AS String) AS String DIM sRes AS String - IF Exist(sMountedLocation &/ "etc/vector-version") THEN - sres = "VectorLinux" - ELSE IF Exist(sMountedLocation &/ "etc/slackware-version") THEN - sres = "Slackware" - ELSE IF Exist(sMountedLocation &/ "etc/Suse-release") OR Exist(sMountedLocation &/ "UnitiedLinux-release") THEN - sres = "SuSE" - ELSE IF Exist(sMountedLocation &/ "etc/gentoo-release") THEN - sres = "Gentoo" + IF Exist(sMountedLocation &/ "etc/arch-release") THEN + sRes = "Arch" + ELSE IF Exist(sMountedLocation &/ "etc/knoppix-version") THEN + sRes = "Knoppix" + ELSE IF Exist(sMountedLocation &/ "etc/sidux-version") THEN + sRes = "Sidux" ELSE IF Exist(sMountedLocation &/ "etc/debian_version") THEN SHELL "grep -m 1 cdrom " & sMountedLocation &/ "etc" &/ "apt" &/ "sources.list | cut -d \"[\" -f2 | cut -d \" \" -f 1,2" TO sres IF Len(Trim(sres)) >= 0 THEN @@ -41,16 +39,58 @@ ELSE sres = "Debian" END IF - ELSE IF Exist(sMountedLocation &/ "etc/mandrake-release") THEN ' this should be mandriva now - sres = "Mandrake" - ELSE IF Exist(sMountedLocation &/ "etc/redhat-release") THEN + ELSE IF Exist(sMountedLocation &/ "/etc/gentoo-release") THEN + sres = "Gentoo" + ELSE IF Exist(sMountedLocation &/ "/etc/redhat-release") THEN sres = "RedHat" + ELSE IF Exist(sMountedLocation &/ "/etc/pclinuxos-release") THEN + sres = "PCLinuxOS" + ELSE IF Exist(sMountedLocation &/ "/etc/mandriva-release") THEN + sres = "Mandriva" + ELSE IF Exist(sMountedLocation &/ "/etc/mandrake-release") THEN + sres = "Mandriva" + ELSE IF Exist(sMountedLocation &/ "etc/vector-version") THEN + sres = "VectorLinux" + ELSE IF Exist(sMountedLocation &/ "etc/slackware-version") THEN + sres = "Slackware" + ELSE IF Exist(sMountedLocation & "/etc/SuSE-release") THEN + sres = "SuSE" + ELSE IF Exist(sMountedLocation &/ "yellowdog-release") THEN + sres = "YellowDog" + ELSE IF Exist(sMountedLocation &/ "etc/zenwalk-version") THEN + sres = "Zenwalk" ELSE IF Exist(sMountedLocation &/ "etc/fedora-release") THEN sres = "Fedora" ELSE sres = "Linux" - END IF + + + ' IF Exist(sMountedLocation &/ "etc/vector-version") THEN + ' sres = "VectorLinux" + ' ELSE IF Exist(sMountedLocation &/ "etc/slackware-version") THEN + ' sres = "Slackware" + ' ELSE IF Exist(sMountedLocation &/ "etc/Suse-release") OR Exist(sMountedLocation &/ "UnitiedLinux-release") THEN + ' sres = "SuSE" + ' ELSE IF Exist(sMountedLocation &/ "etc/gentoo-release") THEN + ' sres = "Gentoo" + ' ELSE IF Exist(sMountedLocation &/ "etc/debian_version") THEN + ' SHELL "grep -m 1 cdrom " & sMountedLocation &/ "etc" &/ "apt" &/ "sources.list | cut -d \"[\" -f2 | cut -d \" \" -f 1,2" TO sres + ' IF Len(Trim(sres)) >= 0 THEN + ' sres = Trim(Replace(sres, " ", "_")) + ' ELSE + ' sres = "Debian" + ' END IF + ' ELSE IF Exist(sMountedLocation &/ "etc/mandrake-release") THEN ' this should be mandriva now + ' sres = "Mandrake" + ' ELSE IF Exist(sMountedLocation &/ "etc/redhat-release") THEN + ' sres = "RedHat" + ' ELSE IF Exist(sMountedLocation &/ "etc/fedora-release") THEN + ' sres = "Fedora" + ' ELSE + ' sres = "Linux" + ' + ' END IF RETURN sres |