5.0-alt7

- merge with desktop branch - unneded subpackages deleted

5.0-alt7
1672b576 · Anton V. Boyarshinov · 8cbfa89b · 4c22d514 · 1672b576 · 1672b576
Commit 1672b576 authored Feb 17, 2009 by Anton V. Boyarshinov
15 changed files
--- a/Makefile.in
+++ b/Makefile.in
@@ -11,6 +11,7 @@ all:
 # background
 	convert images/background.png -gravity northeast -pointsize 30  -annotate 0 '@STATUS@' background.png
 	cp -al background.png graphics/backgrounds/default.png
+	cp -al background.png graphics/backgrounds/xdm.png
 	convert -resize '800x600!' background.png browser-qt/design/bg.png
 	
 	mv kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc "kde3-settings/apps/kdisplay/color-schemes/@BRAND_FNAME@ @NAME@.kcsrc"
--- a/bootloader/config.in
+++ b/bootloader/config.in
-product=ALT Linux @VERSION@ @Theme@
+product=@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@
 based_on=ALT Linux Sisyphus
--- a/branding.spec
+++ b/branding.spec
@@ -2,11 +2,12 @@
 %define Theme OfficeServer
 %define codename none 
 %define brand altlinux
+%define Brand ALT Linux
 %define status alpha

 Name: branding-%brand-%theme
 Version: 5.0
-Release: alt6
+Release: alt7
 BuildArch: noarch

 BuildRequires: cpio gfxboot >= 4 fonts-ttf-dejavu
@@ -68,19 +69,6 @@ PreReq(post,preun): alternatives >= 0.2
 %description browser-qt
 Design for QT alterator for Desktop version

-%package graphics
-Summary: design for ALT
-License: Different licenses
-Group: Graphics
-
-Provides: design-graphics-%theme  branding-alt-%theme-graphics
-Obsoletes:  branding-alt-%theme-graphics
-PreReq(post,preun): alternatives >= 0.2
-
-%description graphics
-This package contains some graphics for ALT design.
-
-
 %define provide_list altlinux fedora redhat system altlinux
 %define obsolete_list altlinux-release fedora-release redhat-release
 %define conflicts_list altlinux-release-sisyphus altlinux-release-4.0 altlinux-release-junior altlinux-release-master altlinux-release-server altlinux-release-terminal altlinux-release-small_business
@@ -98,19 +86,17 @@ Conflicts: %conflicts_list
 %distribution %version %Theme release file.

 %package notes
-Provides: alt-license-desktop = %version
-Obsoletes: alt-license-desktop
-
+Provides: alt-license-theme = %version alt-notes-%theme
+Obsoletes: alt-license-%theme alt-notes-%theme
 Summary: Distribution license and release notes
 License: Distributable
 Group: Documentation
-Provides: alt-notes-%theme
-Obsoletes: alt-notes-%theme
 Conflicts: alt-notes-children alt-notes-desktop alt-notes-hpc alt-notes-junior alt-notes-junior-sj alt-notes-junior-sm alt-notes-school-server alt-notes-server-lite alt-notes-skif alt-notes-terminal 

 %description notes
 Distribution license and release notes

+
 %prep
 %setup -q

@@ -122,7 +108,7 @@ make

 #bootloader
    pushd design-bootloader-source/
-    PATH=$PATH:/usr/sbin %make
+    DEFAULT_LANG=ru PATH=$PATH:/usr/sbin %make
    popd

 #browser-qt
@@ -166,22 +152,6 @@ cat >%buildroot/%_altdir/%name-browser-qt <<__EOF__
 __EOF__
 popd

-#graphics
-mkdir -p %buildroot/%_datadir/design/{%theme,backgrounds}
-cp -ar graphics/* %buildroot/%_datadir/design/%theme
-
-pushd %buildroot/%_datadir/design/%theme
-    pushd backgrounds
-	ln -sf ../../../wallpapers more
-    popd
-popd
-
-install -d %buildroot//etc/alternatives/packages.d
-cat >%buildroot/etc/alternatives/packages.d/%name-graphics <<__EOF__
-%_datadir/artworks	%_datadir/design/%theme 10	
-%_datadir/design-current	%_datadir/design/%theme	10
-__EOF__
-
 #release
 install -pD -m644 /dev/null %buildroot%_sysconfdir/buildreqs/packages/ignore.d/%name-release
 echo "%distribution %version %Theme (%codename)" >%buildroot%_sysconfdir/altlinux-release
@@ -189,11 +159,11 @@ for n in fedora redhat system; do
 	ln -s altlinux-release %buildroot%_sysconfdir/$n-release
 done

+#notes
 pushd notes
 %makeinstall
 popd

-
 #bootloader
 %pre bootloader
 [ -s /boot/splash/%theme ] && rm -fr  /boot/splash/%theme ||:
@@ -225,11 +195,6 @@ popd
 %config %_altdir/%name-browser-qt
 /usr/share/alterator-browser-qt/design/%theme.rcc

-
-%files graphics
-%config /etc/alternatives/packages.d/%name-graphics
-%_datadir/design
-
 %files bootsplash
 %_sysconfdir/bootsplash/themes/%theme/

@@ -241,10 +206,11 @@ popd
 %files notes
 %_datadir/alt-notes/*

+
 %changelog
-* Wed Feb 04 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt6
- fixed theme name in bootloader
- added conflicts for notes
+* Tue Feb 17 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt7
+- merge with desktop branch
+- unneded subpackages deleted

 * Fri Jan 23 2009 Anton V. Boyarshinov <boyarsh@altlinux.ru> 5.0-alt5
 - added 'notes' subpackage 

--- a/configure.ac
+++ b/configure.ac
@@ -7,6 +7,7 @@ INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`


 AC_SUBST(THEME)
+AC_SUBST(NAME)
 AC_SUBST(BRAND_FNAME)
 AC_SUBST(STATUS)
 AC_SUBST(VERSION)
@@ -22,5 +23,9 @@ AC_CONFIG_FILES([
 		 browser-qt/design/design.ini
 		 bootloader/gfxboot.cfg
 		 kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc
+		 notes/release-notes.ru.html
+		 notes/release-notes.all.html
+		 notes/license.ru.html
+		 notes/license.all.html
 ])
 AC_OUTPUT
--- a/graphics/backgrounds/xdm.png
+++ b/graphics/backgrounds/xdm.png
--- a/kde4-settings/Desktop/Home.desktop
+++ b/kde4-settings/Desktop/Home.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Name=Home
+Name[af]=Tuiste
+Name[ar]=المنزل
+Name[as]=প্ৰথম পৃষ্ঠা
+Name[be]=Хатняя тэчка
+Name[be@latin]=Dom
+Name[bg]=Домашна директория
+Name[bn]=ব্যক্তিগত ফোল্ডার
+Name[bn_IN]=ব্যক্তিগত ফোল্ডার
+Name[br]=Er-gêr
+Name[ca]=Inici
+Name[cs]=Můj adresář
+Name[csb]=Dodóm
+Name[cy]=Cartref
+Name[da]=Hjem
+Name[de]=Persönlicher Ordner
+Name[el]=Σπίτι
+Name[eo]=Hejmo
+Name[es]=Carpeta personal
+Name[et]=Kodu
+Name[eu]=Etxea
+Name[fa]=آغازه
+Name[fi]=Koti
+Name[fr]=Dossier personnel
+Name[fy]=Thús
+Name[ga]=Baile
+Name[gl]=Persoal
+Name[gu]=ઘર
+Name[he]=בית
+Name[hi]=घर
+Name[hr]=Početak
+Name[hsb]=Domjacy zapisk
+Name[hu]=Saját könyvtár
+Name[is]=Heimasvæðið þitt
+Name[ja]=ホーム
+Name[ka]=სახლში
+Name[kk]=Мекен
+Name[km]=ផ្ទះ
+Name[kn]=ನೆಲೆ (ಹೋಮ್)
+Name[ko]=홈
+Name[ku]=Mal
+Name[lt]=Pradžia
+Name[lv]=Mājas
+Name[mk]=Дома
+Name[ml]=തട്ടകം
+Name[mr]=मुख्य
+Name[ms]=Laman Utama
+Name[nb]=Hjem
+Name[nds]=Tohuus
+Name[ne]=गृह
+Name[nn]=Heim
+Name[oc]=Repertòri personal
+Name[or]=ଘର
+Name[pa]=ਘਰ
+Name[pl]=Katalog domowy
+Name[pt]=Pasta Pessoal
+Name[pt_BR]=Pasta do usuário
+Name[ro]=Acasă
+Name[ru]=Домашняя папка
+Name[se]=Ruoktu
+Name[sk]=Domov
+Name[sl]=Dom
+Name[sr]=Домаће
+Name[sr@latin]=Domaće
+Name[sv]=Hem
+Name[ta]=அகம்
+Name[te]=ఇల్లు
+Name[tg]=Компютер
+Name[th]=พื้นที่ส่วนตัว
+Name[tr]=Ev Dizini
+Name[uk]=Домівка
+Name[uz]=Uy
+Name[uz@cyrillic]=Уй
+Name[vi]=Nhà
+Name[wa]=Måjhon
+Name[x-test]=xxHomexx
+Name[xh]=Ikhaya
+Name[zh_CN]=主文件夹
+Name[zh_TW]=家目錄
+GenericName=Personal Files
+GenericName[af]=Persoonlike Lêers
+GenericName[ar]=الملفات الشخصية
+GenericName[be]=Персанальныя файлы
+GenericName[be@latin]=Ułasnyja fajły
+GenericName[bg]=Лични файлове
+GenericName[bn]=ব্যক্তিগত ফাইলসমূহ
+GenericName[bn_IN]=ব্যক্তিগত ফাইল
+GenericName[br]=Restroù deoc'h
+GenericName[ca]=Fitxers personals
+GenericName[cs]=Osobní soubory
+GenericName[csb]=Swòje lopczi
+GenericName[cy]=Ffeiliau Personol
+GenericName[da]=Personlige filer
+GenericName[de]=Eigene Dateien
+GenericName[el]=Προσωπικά αρχεία
+GenericName[eo]=Personaj dosieroj
+GenericName[es]=Archivos personales
+GenericName[et]=Isiklikud failid
+GenericName[eu]=Fitxategi pertsonalak
+GenericName[fa]=پرونده‌های شخصی
+GenericName[fi]=Omat tiedostot
+GenericName[fr]=Fichiers personnels
+GenericName[fy]=Persoanlike map
+GenericName[ga]=Comhaid Phearsanta
+GenericName[gl]=Ficheiros persoais
+GenericName[gu]=અંગત ફાઇલો
+GenericName[he]=קבצים אישיים
+GenericName[hi]=निजी फ़ाइलें
+GenericName[hr]=Osobne datoteke
+GenericName[hsb]=Wosobinske dataje
+GenericName[hu]=Személyes fájlok
+GenericName[is]=Skrárnar þínar
+GenericName[it]=File personali
+GenericName[ja]=個人のファイル
+GenericName[ka]=პირადი საქაღალდეები
+GenericName[kk]=Дербес файлдар
+GenericName[km]=ឯកសារផ្ទាល់ខ្លួន
+GenericName[kn]=ವೈಯಕ್ತಿಕ ಕಡತಗಳು
+GenericName[ko]=개인적인 파일
+GenericName[ku]=Pelên takekesî
+GenericName[lt]=Asmeniniai failai
+GenericName[lv]=Personīgie faili
+GenericName[mk]=Лични датотеки
+GenericName[ml]=സ്വകാര്യ ഫയലുകള്‍
+GenericName[mr]=खाजगी फाइल
+GenericName[ms]=Fail Peribadi
+GenericName[nb]=Personlige filer
+GenericName[nds]=De egen Dateien
+GenericName[ne]=व्यक्तिगत फाइल
+GenericName[nl]=Persoonlijke map
+GenericName[nn]=Personlege filer
+GenericName[or]=ବ୍ୟକ୍ତିଗତ ଫାଇଲଗୁଡ଼ିକ
+GenericName[pa]=ਨਿੱਜੀ ਫਾਇਲਾਂ
+GenericName[pl]=Pliki osobiste
+GenericName[pt]=Ficheiros Pessoais
+GenericName[pt_BR]=Arquivos Ppessoais
+GenericName[ro]=Fișiere personale
+GenericName[ru]=Личные файлы
+GenericName[se]=Iežat fiillat
+GenericName[sk]=Osobné súbory
+GenericName[sl]=Osebne datoteke
+GenericName[sr]=Лични фајлови
+GenericName[sr@latin]=Lični fajlovi
+GenericName[sv]=Personliga filer
+GenericName[ta]=தனிப்பட்ட கோப்புகள்
+GenericName[te]=వ్యక్తిగత దస్త్రాలు
+GenericName[tg]=Файлҳои шахсӣ
+GenericName[th]=แฟ้มส่วนตัว
+GenericName[tr]=Kişisel Dosyalar
+GenericName[uk]=Особисті файли
+GenericName[uz]=Shaxsiy fayllar
+GenericName[uz@cyrillic]=Шахсий файллар
+GenericName[vi]=Tập tin Cá nhân
+GenericName[wa]=Fitchîs da vosse
+GenericName[x-test]=xxPersonal Filesxx
+GenericName[xh]=Iifayile Zobuqu
+GenericName[zh_CN]=个人文件
+GenericName[zh_TW]=個人檔案
+URL[$e]=$HOME
+Icon=user-home
+Type=Link
+
--- a/kde4-settings/Desktop/trash.desktop
+++ b/kde4-settings/Desktop/trash.desktop
+[Desktop Entry]
+Encoding=UTF-8
+Name=Trash
+Name[ar]=سلة المهملات
+Name[be@latin]=Śmietnica
+Name[bg]=Кошче
+Name[bn]=আবর্জনা
+Name[bn_IN]=আবর্জনা
+Name[ca]=Paperera
+Name[cs]=Koš
+Name[csb]=Kòsz
+Name[da]=Affald
+Name[de]=Mülleimer
+Name[el]=Κάδος απορριμάτων
+Name[es]=Papelera
+Name[et]=Prügikast
+Name[eu]=Zakarontzia
+Name[fa]=زباله
+Name[fi]=Roskakori
+Name[fr]=Corbeille
+Name[ga]=Bruscar
+Name[gl]=Lixo
+Name[gu]=કચરાપેટી
+Name[he]=אשפה
+Name[hi]=रद्दी
+Name[hsb]=Papjernik
+Name[is]=Rusl
+Name[it]=Cestino
+Name[ja]=ごみ箱
+Name[kk]=Өшірілгендер
+Name[km]=ធុងសំរាម
+Name[kn]=ಕಸಬುಟ್ಟಿ
+Name[ko]=휴지통
+Name[ku]=Çop
+Name[lt]=Šiukšliadėžė
+Name[lv]=Miskaste
+Name[mk]=Корпа
+Name[ml]=ചവറു്‌
+Name[mr]=कचरापेटी
+Name[nb]=Søppelbøtte
+Name[nds]=Affalltünn
+Name[nl]=Prullenbak
+Name[or]=ଆବର୍ଜନା ପାତ୍ର
+Name[pa]=ਰੱਦੀ
+Name[pl]=Kosz
+Name[pt]=Lixo
+Name[pt_BR]=Lixo
+Name[ro]=Gunoi
+Name[ru]=Корзина
+Name[sk]=Kôš
+Name[sl]=Smeti
+Name[sr]=Смеће
+Name[sr@latin]=Smeće
+Name[sv]=Papperskorg
+Name[ta]=அகற்றிடம்
+Name[tg]=Сабад
+Name[th]=ถังขยะ
+Name[tr]=Çöp
+Name[uk]=Смітник
+Name[wa]=Batch
+Name[x-test]=xxTrashxx
+Name[zh_CN]=回收站
+Name[zh_TW]=資源回收筒
+Comment=Contains removed files
+Comment[ar]=تحوي الملفات المزالة
+Comment[be]=Утрымлівае выдаленыя файлы
+Comment[be@latin]=Zachoŭvaje vydalenyja fajły
+Comment[bn]=মুছে ফেলা ফাইল থাকে
+Comment[bn_IN]=মুছে ফেলা ফাইল থাকে
+Comment[ca]=Conté els fitxers suprimits
+Comment[cs]=Obsahuje odstraněné soubory
+Comment[cy]=Yn cynnwys ffeiliau sydd wedi eu gwaredu
+Comment[da]=Indeholder slettede filer
+Comment[de]=Enthält weggeworfene Dateien
+Comment[el]=Περιέχει τα αφαιρεμένα αρχεία
+Comment[es]=Contiene los archivos eliminados
+Comment[et]=Sisaldab eemaldatud faile
+Comment[eu]=Kendutako fitxategiak ditu
+Comment[fi]=Sisältää poistetut tiedostot
+Comment[fr]=Contiens les fichiers effacés
+Comment[gl]=Contén ficheiros eliminados
+Comment[gu]=દૂર કરેલ ફાઇલ ધરાવે છે
+Comment[he]=מכיל קבצים שהוסרו
+Comment[hi]=मिटाई गई फ़ाइलों को रखता है
+Comment[hr]=Sadrži izbrisane datoteke
+Comment[hsb]=Tu so namakaja zničene dataje
+Comment[is]=Inniheldur skrár sem hefur verið eytt
+Comment[it]=Contiene i file cancellati
+Comment[ja]=削除されたファイルを保管しています
+Comment[ka]=შეიცავს წაშლილ ფაილებს
+Comment[kk]=Өшірілген файлдар жататын орын
+Comment[km]=មានឯកសារដែលបានយកចេញ
+Comment[ko]=삭제된 파일 및 폴더가 있습니다
+Comment[lt]=Čia yra ištrintos bylos
+Comment[lv]=Satur izmestos failus
+Comment[mk]=Содржи избришани датотеки
+Comment[ml]=നീക്കം ചെയ്യപെട്ട ഫയലുകള്‍ ഉല്പെടുന്നു
+Comment[mr]=काढूण टाकलेले फाइल समाविष्टीत आहे
+Comment[nb]=Inneholder filer som er fjernet
+Comment[nds]=Bargt wegmaakt Dateien
+Comment[nl]=Bevat de verwijderde bestanden
+Comment[or]=ଅପସାରିତ ଫାଇଲଗୁଡ଼ିକୁ ଧାରଣ କରିଥାଏ
+Comment[pa]=ਹਟਾਈਆਂ ਫਾਇਲਾਂ ਰੱਖਦਾ ਹੈ
+Comment[pl]=Zawiera usunięte pliki
+Comment[pt]=Contém os ficheiros removidos
+Comment[pt_BR]=Contém arquivos removidos
+Comment[ro]=Conține fișierele șterse
+Comment[sk]=Obsahuje vymazané súbory
+Comment[sl]=Vsebujejo odstranjene datoteke
+Comment[sr]=Садржи уклоњене фајлове
+Comment[sr@latin]=Sadrži uklonjene fajlove
+Comment[sv]=Innehåller borttagna filer
+Comment[ta]=அகற்றப்பட்ட கோப்புகள் இருக்கிறது
+Comment[tg]=Дорои файлҳои несткардашуда
+Comment[th]=บรรจุแฟ้มที่ถูกลบ
+Comment[tr]=Silinen dosyaları içerir
+Comment[uk]=Містить вилучені файли
+Comment[uz]=Olib tashlangan fayllardan iborat
+Comment[uz@cyrillic]=Олиб ташланган файллардан иборат
+Comment[vi]=Chứa tập tin bị gỡ bỏ
+Comment[wa]=I gn a dvins des fitchîs oistés
+Comment[x-test]=xxContains removed filesxx
+Comment[xh]=Iqulathe iifayile ezisusiweyo
+Comment[zh_CN]=储存已删除的文件
+Comment[zh_TW]=包含已移除的檔案
+Icon=user-trash-full
+EmptyIcon=user-trash
+Type=Link
+URL=trash:/
+OnlyShowIn=KDE;
+
--- a/kde4-settings/kde4/share/config/kwinrc
+++ b/kde4-settings/kde4/share/config/kwinrc
+[Desktops]
+Name_1=
+Name_2=
+Number=2
--- a/kde4-settings/kde4/share/config/plasma-appletsrc
+++ b/kde4-settings/kde4/share/config/plasma-appletsrc
+[AppletGlobals][plasma_applet_pager]
+rows=2
+
+[Containments][1]
+activity=
+backgroundmode=0
+desktop=-1
+formfactor=0
+immutability=1
+location=0
+plugin=folderview
+screen=0
+selected=
+wallpapercolor=224,223,222
+wallpaperplugin=image
+wallpaperpluginmode=SingleImage
+wallpaperposition=2
+zvalue=0
+
+[Containments][1][Wallpaper][image]
+slideTimer=600
+slidepaths=/usr/share/wallpapers/
+userswallpapers=/usr/share/design/current/backgrounds/default.png
+wallpaper=/usr/share/design/current/backgrounds/default.png
+wallpapercolor=56,111,150
+wallpaperposition=0
+
+[Containments][3]
+activity=
+desktop=-1
+formfactor=2
+immutability=1
+location=4
+plugin=panel
+screen=0
+zvalue=150
+
+[Containments][3][Applets][10]
+geometry=1800,3,32,32
+immutability=1
+plugin=trash
+zvalue=0
+
+
+[Containments][3][Applets][15]
+geometry=100,3,96,32
+immutability=1
+plugin=quicklaunch
+zvalue=0
+
+[Containments][3][Applets][15][Configuration]
+iconUrls=file:///usr/share/applications/oowriter.desktop,file:///usr/share/applications/firefox.desktop,file:///usr/share/kde4/applications/kde4/dolphin.desktop
+
+
+[Containments][3][Applets][4]
+geometry=0,3,32,32
+immutability=1
+plugin=launcher
+zvalue=0
+
+[Containments][3][Applets][4][Configuration]
+SwitchTabsOnHover=false
+
+[Containments][3][Applets][4][Shortcuts]
+global=Alt+F1
+
+[Containments][3][Applets][5]
+immutability=1
+geometry=1666,3,60,32
+plugin=notifier
+zvalue=0
+
+[Containments][3][Applets][6]
+geometry=36,3,60,32
+immutability=1
+plugin=pager
+zvalue=0
+
+[Containments][3][Applets][6][Configuration]
+displayedText=0
+showWindowIcons=false
+
+[Containments][3][Applets][7]
+immutability=1
+plugin=tasks
+zvalue=0
+
+[Containments][3][Applets][8]
+geometry=1620,3,112,32
+immutability=1
+plugin=systemtray
+zvalue=0
+
+[Containments][3][Applets][8][Configuration]
+hidden=
+
+[Containments][3][Applets][8][Configuration][PopupApplet]
+DialogHeight=72
+DialogWidth=200
+
+[Containments][3][Applets][9]
+geometry=1738,3,64,32
+immutability=1
+plugin=digital-clock
+zvalue=0
+
+[Containments][3][Applets][9][Configuration]
+currentTimezone=Local
+plainClockColor=255,255,255
+plainClockFont=Sans,22,-1,5,50,0,0,0,0,0
+showDate=true
+showDay=false
+showSeconds=false
+showTimezone=false
+showYear=false
+timeZones=
+useCustomColor=false
+
+[Containments][3][Applets][9][Configuration][PopupApplet]
+DialogHeight=251
+DialogWidth=248
+
+[Containments][3][Applets][11]
+immutability=1
+geometry=1580,3,112,32
+plugin=networkmanagement
+zvalue=0
+
+
+[General]
+immutability=2
--- a/kde4-settings/kde4/share/config/plasmarc
+++ b/kde4-settings/kde4/share/config/plasmarc
+[Containments][1]
+activity=
+desktop=0
+filter=0
+filterFiles=*
+formfactor=0
+immutability=1
+location=0
+mimeFilter=
+plugin=folderview
+screen=0
+url=desktop:/
+wallpaperplugin=image
+wallpaperpluginmode=SingleImage
+
+[Containments][1][Wallpaper][image]
+slideTimer=600
+slidepaths=/usr/share/wallpapers/
+userswallpapers=/usr/share/design/current/backgrounds/default.png
+wallpaper=/usr/share/design/current/backgrounds/default.png
+wallpapercolor=56,111,150
+wallpaperposition=0
+
+[KFileDialog Settings]
+Height 864=450
+Width 1152=700
+
+[KPropertiesDialog]
+Height 864=397
+Width 1152=886
+
+[PlasmaAppletBrowserDialog]
+Height 864=599
+Width 1152=570
+
+[PlasmaViews][1]
+panelVisibility=0
+
+[Theme]
+name=Aya
+
+[ViewIds]
+1=2
+3=1
--- a/notes/license.all.html
+++ b/notes/license.all.html
@@ -6,12 +6,12 @@
 <body>

 <h1>License agreement</h1>
-<h2>for ALT Linux 4.1 Desktop and included software applications</h2>
+<h2>for @BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ 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>ALT Linux 4.1 Desktop</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@ @STATUS@</strong> ("Distribution") and you ("Licensee"), end-user of the Distribution.</p>

 <p>1.2 Agreement object</p>


--- a/notes/license.ru.html
+++ b/notes/license.ru.html
@@ -6,13 +6,13 @@
 <body>

 <h1>Лицензионный договор</h1>
-<h2>на программное обеспечение ALT Linux 4.1 Desktop и включенные в него программы для ЭВМ</h2>
+<h2>на программное обеспечение @BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ и включенные в него программы для ЭВМ</h2>

 <p><b>1. Сведения о договоре</b></p>
 <p>1.1 Участники договора</p>

 <p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение 
-<strong>ALT Linux 4.1 Desktop</strong> 
+<strong>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</strong> 
 (далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p>

 <p>1.2 Предмет договора</p>

--- a/notes/release-notes.all.html
+++ b/notes/release-notes.all.html
@@ -3,6 +3,6 @@
    <meta http-equiv="content-type" value="text/html;charset=utf-8"/>
 </head>
 <body>
-    <p>ALT Linux 4.1 Desktop distribution is installed and ready to use.</p>
+    <p>@BRAND_FNAME@ @VERSION@ @NAME@ distribution is installed and ready to use.</p>
 </body>
 </html>
--- a/notes/release-notes.ru.html
+++ b/notes/release-notes.ru.html
-<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
-<HTML>
-<HEAD>
-	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
-	<TITLE></TITLE>
-</HEAD>
-<BODY>
-<H2>Благодарим Вас за
-выбор ALT Linux 4.1 Desktop!</H2>
-
-<P ALIGN=JUSTIFY>Теперь Ваш
-компьютер оснащён не только современной
-и безопасной операционной системой, но
-и набором большинства необходимых для
-работы программ. Это офисный пакет,
-программы для работы с графикой,
-мультимедиа, Интернетом и многое-многое
-другое.</P>
-<P ALIGN=JUSTIFY>Программы,
-входящие в состав  дистрибутива ALT Linux
-4.1 Desktop поддерживают большинство
-распространённых форматов файлов и
-имеют удобный графический интерфейс.</P>
-<P ALIGN=JUSTIFY>Обращаем Ваше
-внимание на то, что в комплектацию
-коробочной версии дистрибутива включен
-купон технической поддержки с уникальным
-номером. По нему Вы можете воспользоваться
-услугой Базовой технической поддержки.</P>
-<P ALIGN=JUSTIFY>С условиями
-Расширенной технической поддержки
-можно ознакомиться на нашем сайте:
-<A HREF="http://www.altlinux.ru/">www.altlinux.ru</A></P>
-<P><BR>
-</P>
-<P>Желаем Вам приятной
-работы!</P>
-</BODY>
-</HTML>
--- a/notes/release-notes.ru.html.in
+++ b/notes/release-notes.ru.html.in
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
+<HTML>
+<HEAD>
+	<META HTTP-EQUIV="CONTENT-TYPE" CONTENT="text/html; charset=utf-8">
+	<TITLE></TITLE>
+</HEAD>
+<BODY>
+<H2>Благодарим Вас за
+тестирование @BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@!</H2>
+
+<h1>Спокойной плазмы! ;)</h1>
+</BODY>
+</HTML>