STATUS removed. It's not beta/alpha etc. anymore

f4341d68 · Alexandra Panyukova · d6761f7e · f4341d68 · f4341d68 · f4341d68
Commit f4341d68 authored Oct 20, 2009 by Alexandra Panyukova
8 changed files
--- a/Makefile.in
+++ b/Makefile.in
@@ -5,7 +5,8 @@ VERSION=@VERSION@

 all:
 # background
-	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
+#	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "@STATUS@"' wallpaper.png
+	cp -al images/wallpaper.png wallpaper.png
 	cp -al wallpaper.png graphics/backgrounds/default.png
 	cp -al wallpaper.png graphics/backgrounds/xdm.png
 	convert wallpaper.png kde3-styles-splash/Background.jpg

--- a/components.mk
+++ b/components.mk
 # browser-qt

 components/browser-qt/design/bg.png: images/installer.png
-	convert $< -resize '800x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@
+	convert $< -resize '800x600!' $@
+	#convert $< -resize '800x600!' -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' $@

 browser-qt:components/browser-qt/design/bg.png
 	install -d $(datadir)/alterator-browser-qt/design
@@ -24,7 +25,7 @@ boot:
 	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-install/
 	cp -a components/bootloader/gfxboot.cfg design-bootloader-source/data-boot/
 	for size in 1024x768 800x600 640x480; do \
-		convert images/boot.png -resize "$$size!" -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -gravity northeast -draw 'text 25,25 "$(STATUS)"' boot-$$size.jpg ;\
+		convert images/boot.png -resize "$$size!" boot-$$size.jpg ;\
 		cp -al boot-$$size.jpg components/bootsplash/images/silent-$$size.jpg ;\
 		convert -resize "$$size!" images/console.jpg components/bootsplash/images/bootsplash-$$size.jpg;\
 	done

--- a/components/bootloader/config.in
+++ b/components/bootloader/config.in
-product=@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@
+product=@BRAND_FNAME@ @VERSION@ @NAME@
 based_on=ALT Linux Sisyphus
--- a/indexhtml/indexhtml.desktop.in
+++ b/indexhtml/indexhtml.desktop.in
@@ -4,8 +4,8 @@ Type=Application
 Exec=xdg-open /usr/share/doc/alt-docs/indexhtml/index.html
 StartupNotify=false
 Icon=altlinux
-Name=@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@: start page
+Name=@BRAND_FNAME@ @VERSION@ @NAME@: start page
 Categories=System;Documentation;

 # Translations
-Name[ru]=@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@: cтартовая страница
+Name[ru]=@BRAND_FNAME@ @VERSION@ @NAME@: cтартовая страница
--- a/kde3-styles-splash/Theme.rc.in
+++ b/kde3-styles-splash/Theme.rc.in
 [KSplash Theme: ALTLinux@NAME@]
 Name = @BRAND_FNAME@ @VERSION@ @NAME@
-Description = @BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ Default KDE Splash Theme
-Description[ru] = Заставка KDE по умолчанию для @BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@
+Description = @BRAND_FNAME@ @VERSION@ @NAME@ Default KDE Splash Theme
+Description[ru] = Заставка KDE по умолчанию для @BRAND_FNAME@ @VERSION@ @NAME@
 Version = @VERSION@
 Author = Alexandra Panyukova <mex3@altlinux.ru>
 Author[ru] = Александра Панюкова <mex3@altlinux.ru>

--- a/notes/index-en.html.in
+++ b/notes/index-en.html.in
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+<head>
+  <title>@BRAND_FNAME@ @VERSION@ @NAME@</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link rel="stylesheet" type="text/css" href="index.css">
+</head>
+
+<body onload="MakeLink()">
+<script type="text/javascript" src="makelink.js"></script>
+
+<div id="top">
+	<table>
+	    <tbody>
+		<tr>
+		    <td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
+		    <td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
+		</tr>
+	    </tbody>
+	</table>
+</div>
+
+<div class="box" id="lang">
+ <a href="index-ru.html">Русский</a>
+</div>
+
+<div class="box">
+  <p align="justify">Welcome to <nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr>. The distribution is set up and ready to use, you may proceed. We hope that results of our work will be of use to you.</p>
+
+  <h2>Server configuration</h2>
+  <ul>
+    <li id="smc_link">Web-interface for server configuration
+    <span class="linkemu">https://ip-address:8080/</span></li>
+    <li id="cups_link">Commn UNIX Printing System (CUPS) Settings
+    <span class="linkemu">http://ip-address:631/</span></li>
+  </ul>
+  <div class="warning">
+  Attention! For security reasons, it is recommended to log out after configuration.
+  </div>
+
+
+  <h2>Documentation</h2>
+  <ul>
+   <li><a href="../../@THEME@/index.html">Local documentation on this distribution</a></li>
+   <li><a href="http://altlinux.org/">Online documentation on http://altlinux.org</a></li>
+  </ul>
+
+  <h2>In the Internet</h2>
+  <ul>
+   <li><a href="http://www.altlinux.ru/">Official ALT Linux website - http://www.altlinux.org</a></li>
+   <li><a href="http://shop.altlinux.ru/">Online shop - http://shop.altlinux.ru</a></li>
+  </ul>
+  
+  <h2>Support</h2>
+
+  <h3>Official ALT Linux support</h3>
+  <ul>
+  <li><a href="http://altlinux.ru/support">http://altlinux.ru/support</a></li>
+  </ul>
+  <div class="warning">
+  Only for registered users with coupons!
+  </div>
+  <h3>Unofficial support</h3>
+  <ul>
+  <li><a href="http://lists.altlinux.org/">Mailing lists</a></li>
+  <li><a href="http://forum.altlinux.org/">Forum</a></li>
+  <li><a href="http://bugzilla.altlinux.org/">Bug tracking system</a></li>
+  <li><a href="http://search.altlinux.org/">Search on ALT Linux websites</a></li>
+  </ul>
+  <div class="warning">
+  No warranity on solving problems!
+  </div>
+
+</div>
+
+<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr> &copy; ALT Linux, 2008. All rights reserved.<br />
+  Address: 5th Donskoy proezd, 15/6, Moscow<br />
+  Phone/Fax: +7 (495) 662-3883
+</p>
+
+</body>
+</html>
--- a/notes/index-ru.html.in
+++ b/notes/index-ru.html.in
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+<head>
+  <title>@BRAND_FNAME@ @VERSION@ @NAME@</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link rel="stylesheet" type="text/css" href="index.css">
+</head>
+
+<body onload="MakeLink()">
+<script type="text/javascript" src="makelink.js"></script>
+
+<div id="top">
+	<table>
+	    <tbody>
+		<tr>
+		    <td style="text-align:left;width:100%"><img id="product-logo" src="img/null.gif"/></td>
+		    <td style="text-align:right"><img id="brand-logo" src="img/null.gif"/></td>
+		</tr>
+	    </tbody>
+	</table>
+</div>
+
+<div class="box" id="lang">
+ <a href="index-en.html">English</a>
+</div>
+
+<div class="box">
+  <p>Добро пожаловать в <nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p>
+  
+  <h2>Настройка сервера</h2>
+  <ul>
+    <li id="smc_link">Интерфейс администрирования сервера
+    <span class="linkemu">https://ip-address:8080/</span></li>
+    <li id="cups_link">Настройка системы печати CUPS
+    <span class="linkemu">http://ip-address:631/</span></li>
+  </ul>
+  <div class="warning">
+  Внимание! В целях безопасности после окончания настройки выходите из административного интерфейса.
+  </div>
+
+  <h2>Документация</h2>
+  <ul>
+    <li><a href="../../@THEME@/index.html">Локальная документация по дистрибутиву</a></li>
+    <li><a href="http://altlinux.org/">Онлайновая документация на http://altlinux.org</a></li>
+  </ul>
+
+  <h2>Веб-сайты</h2>
+  <ul>
+   <li><a href="http://www.altlinux.ru/">Официальный сайт компании ALT Linux - http://altlinux.ru</a></li>
+   <li><a href="http://shop.altlinux.ru/">Интернет-магазин - http://shop.altlinux.ru</a></li>
+  </ul>
+
+  <h2>Техническая поддержка</h2>
+  
+  <h3>Платная официальная поддержка</h3>  
+  <ul>
+  <li><a href="http://altlinux.ru/support">http://altlinux.ru/support</a></li>
+  </ul>
+  <div class="warning">
+  Предоставляется только зарегистрированным пользователям (по купонам).
+  </div>
+
+  <h3>Неофициальная поддержка</h3>
+  <ul>
+  <li><a href="http://lists.altlinux.org/">Списки рассылки</a></li>
+  <li><a href="http://forum.altlinux.org/">Форум</a></li>
+  <li><a href="http://bugzilla.altlinux.org/">Система сбора ошибок по дистрибутивам</a></li>
+  <li><a href="http://search.altlinux.org/">Поиск по ресурсам ALT Linux</a></li>
+  </ul>
+  <div class="warning">
+  Общение с пользователями без гарантий разрешения проблем!
+  </div>
+  
+</div>
+
+<p class="footer"><nobr>@BRAND_FNAME@ @VERSION@ @NAME@</nobr> &copy; ALT Linux, 2009. Все права защищены.<br />
+   Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 6<br />
+   Телефон/факс: +7 (495) 662-3883
+</p>
+
+</body>
+</html>
--- a/notes/license.all.html.in
+++ b/notes/license.all.html.in
@@ -6,12 +6,12 @@
 <body>

 <h1>License agreement</h1>
-<h2>for @BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ and included software applications</h2>
+<h2>for @BRAND_FNAME@ @VERSION@ @NAME@ and included software applications</h2>

 <p><b>1. Agreement information</b></p>
 <p>1.1 Parties to the contract</p>

-<p>This Software License Agreement ("Agreement") is made and effective by and between ALT Linux Ltd. ("Developer"), which owns rights for <strong>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</strong> ("Distribution") and you ("Licensee"), end-user of the Distribution.</p>
+<p>This Software License Agreement ("Agreement") is made and effective by and between ALT Linux Ltd. ("Developer"), which owns rights for <strong>@BRAND_FNAME@ @VERSION@ @NAME@</strong> ("Distribution") and you ("Licensee"), end-user of the Distribution.</p>

 <p>1.2 Agreement object</p>