Merge remote-tracking branch 'zerg-school-master/sisyphus' into school-master

Conflicts:
	Makefile.in
	branding.spec
	components.mk
	components/ahttpd/images/groups/firewall.png
	components/indexhtml/index-ru.html.in
	components/indexhtml/indexhtml.desktop.in
	images/installer.png
	notes/index-ru.html.in
	notes/license.ru.html.in
	notes/release-notes.all.html.in
	notes/release-notes.ru.html.in

.gear-rules

@@ -1 +1 @@
-tar: . name=branding
+tar: . name=branding-informika-schoolmaster

Makefile.in

@@ -5,8 +5,7 @@ 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 wallpaper.png
+	convert images/wallpaper.png -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -draw 'gravity SouthEast rotate -90 text -300,5 "$(STATUS)"' 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

branding.spec

@@ -1,13 +1,18 @@
-%define theme master
 %define Theme School Master
-%define codename none
-%define brand school
-%define Brand ALT Linux
+%define codename Chariot
+%define brand informika
+%define Brand Informika Linux
 
+Name: branding-%brand-schoolmaster
+Version: 6.0.0
+Release: alt46
+BuildArch: noarch
 
-Name: branding-%brand-%theme
-Version: 6.0.0 
-Release: alt5
+%define theme %name
+%define design_graphics_abi_epoch 0
+%define design_graphics_abi_major 12
+%define design_graphics_abi_minor 0
+%define design_graphics_abi_bugfix 0
 
 BuildRequires: cpio fonts-ttf-dejavu fonts-ttf-droid
 BuildRequires: design-bootloader-source >= 5.0-alt2
@@ -15,19 +20,19 @@ BuildRequires: design-bootloader-source >= 5.0-alt2
 BuildRequires: cpio gfxboot >= 4 
 %endif
 
-BuildRequires(pre): libqt4-core 
+BuildRequires(pre): libqt4-core
 BuildRequires: libalternatives-devel
 BuildRequires: libqt4-devel
 
 BuildRequires: ImageMagick fontconfig bc libGConf-devel
 
+%define Theme_ru Школьный Мастер
+%define Brand_ru Информика Линукс
 %define status %nil
 %define status_en %nil
-%define variants altlinux-backup-server altlinux-centaurus altlinux-desktop altlinux-gnome-desktop altlinux-kdesktop altlinux-lite altlinux-lxdesktop altlinux-office-desktop altlinux-office-server altlinux-school-server altlinux-sisyphus altlinux-spt altlinux-workbench ivk-chainmail lxde-desktop lxde-school-lite Platform6-server-light school-junior school-lite school-server school-terminal simply-linux 
+%define variants altlinux-kdesktop altlinux-desktop altlinux-office-desktop altlinux-office-server altlinux-lite altlinux-workbench school-master altlinux-gnome-desktop
 
-Packager: Andrey Cherepanov <cas@altlinux.org>
-
-Source: branding.tar
+Source: %name.tar
 
 Group: Graphics
 Summary: System/Base
@@ -46,7 +51,6 @@ PreReq: coreutils
 Provides: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
 
 Obsoletes: design-bootloader-system-%theme design-bootloader-livecd-%theme design-bootloader-livecd-%theme design-bootloader-%theme branding-alt-%theme-bootloader
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootloader ";done )
 
 %define grub_normal white/black
 %define grub_high black/white
@@ -60,11 +64,10 @@ BuildArch: noarch
 Summary: Theme for splash animations during bootup
 License: Distributable
 Group:  System/Configuration/Boot and Init
-Provides: plymouth-theme-%theme
+Provides: plymouth-theme-%theme plymouth(system-theme)
 Requires: plymouth-plugin-script
 PreReq: plymouth
 
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-bootsplash ";done )
 %description bootsplash
 This package contains graphics for boot process, displayed via Plymouth
 
@@ -88,13 +91,11 @@ BuildArch: noarch
 Summary: design for ALT
 License: Different licenses
 Group: Graphics
-
-Provides: design-graphics-%theme  branding-alt-%theme-graphics
-Obsoletes: branding-alt-%theme-graphics design-graphics-%theme
-Provides: design-graphics = 12.0.0
+Provides: design-graphics = %design_graphics_abi_major.%design_graphics_abi_minor.%design_graphics_abi_bugfix
+Provides: design-graphics-%theme  branding-alt-%theme-graphics design-graphics-kdesktop
+Obsoletes:  branding-alt-%theme-graphics design-graphics-%theme design-graphics-kdesktop
 Provides: gnome-session-splash = %version-%release
 PreReq(post,preun): alternatives >= 0.2
-Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-graphics ";done )
 
 %description graphics
 This package contains some graphics for ALT design.
@@ -148,7 +149,6 @@ BuildArch: noarch
 Summary: FVWM2 settings for %Brand %version %Theme
 License: Distributable
 Group: Graphical desktop/FVWM based
-Requires: altlinux-freedesktop-menu-gnomish-menu
 Conflicts: %(for n in %variants ; do [ "$n" = %brand-%theme ] || echo -n "branding-$n-fvwm-settings ";done )
 
 %description fvwm-settings
@@ -161,8 +161,7 @@ Summary: GNOME settings for %Brand %version %Theme
 License: Distributable
 Group: Graphical desktop/GNOME
 Requires: gtk2-theme-mist
-Requires: gksu
-Requires: altlinux-freedesktop-menu-gnomish-menu
+#PreReq: gnome-panel
 Provides: gnome-theme-%brand-%theme = %version-%release
 Provides: metacity-theme-%brand-%theme = %version-%release
 Provides: metacity-theme
@@ -201,7 +200,7 @@ Requires(post): indexhtml-common
 ALT Linux index.html welcome page.
 
 %prep
-%setup -n branding
+%setup -n %name
 
 %ifnarch %arm
 %define x86 boot
@@ -211,7 +210,7 @@ ALT Linux index.html welcome page.
 
 %build
 autoconf
-THEME=%theme NAME='%Theme' BRAND_FNAME='%Brand' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version X86='%x86' ./configure 
+THEME=%theme NAME='%Theme' NAME_RU='%Theme_ru' BRAND_FNAME='%Brand' BRAND_FNAME_RU='%Brand_ru' BRAND='%brand' STATUS_EN=%status_en STATUS=%status VERSION=%version X86='%x86' ./configure 
 make
 
 %install
@@ -227,14 +226,16 @@ pushd %buildroot/%_datadir/design/%theme
     popd
 popd
 
+GRAPHICS_ALTPRIO=`printf '%%.3d%%.3d%%.3d%%.3d\n' %design_graphics_abi_epoch %design_graphics_abi_major %design_graphics_abi_minor %design_graphics_abi_bugfix`
 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
-%_datadir/design/current	%_datadir/design/%theme	10
+%_datadir/design-current	%_datadir/design/%theme	$GRAPHICS_ALTPRIO
+%_datadir/design/current	%_datadir/design/%theme	$GRAPHICS_ALTPRIO
 __EOF__
 
+
 #release
+mkdir -p %buildroot%_sysconfdir/buildreqs/packages/ignore.d/
 install -pD -m644 /dev/null %buildroot%_sysconfdir/buildreqs/packages/ignore.d/%name-release
 echo -n "%distribution %version %Theme" >%buildroot%_sysconfdir/altlinux-release
 test -n "%status_en" && echo -n " %status_en" >>%buildroot%_sysconfdir/altlinux-release
@@ -253,6 +254,8 @@ popd
 pushd kde4-settings
 mkdir -p %buildroot%_sysconfdir/skel/.kde4
 cp -a kde4/* %buildroot%_sysconfdir/skel/.kde4/
+mkdir -p %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
+install -m 0644 menu/*.menu %buildroot%_sysconfdir/kde4/xdg/menus/applications-merged/
 popd
 
 #fwvm-settings
@@ -269,14 +272,14 @@ install -m 644 gtkrc '%buildroot/%_datadir/themes/%XdgThemeName/gtk-2.0'
 mkdir -p '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1'
 install -m 644 metacity-theme-1.xml '%buildroot/%_datadir/themes/%XdgThemeName/metacity-1/'
 install -m 644 index.theme '%buildroot/%_datadir/themes/%XdgThemeName/'
-mkdir -p '%buildroot/etc/xdg/menus/'
-install -m 644 gnome-applications.menu '%buildroot/etc/xdg/menus/'
-install -m 644 settings.menu '%buildroot/etc/xdg/menus/'
+mkdir -p '%buildroot/etc/gnome/xdg/menus/'
+install -m 644 gnome-applications.menu '%buildroot/etc/gnome/xdg/menus/'
+install -m 644 settings.menu '%buildroot/etc/gnome/xdg/menus/'
 popd
 
 #slideshow
 mkdir -p %buildroot/usr/share/install2/slideshow
-install slideshow/*  %buildroot/usr/share/install2/slideshow/
+install -m 0644 slideshow/*  %buildroot/usr/share/install2/slideshow/
 
 #bootloader
 %pre bootloader
@@ -349,6 +352,7 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \
 %_datadir/alt-notes/*
 
 %files kde4-settings
+%_sysconfdir/kde4/xdg/menus/applications-merged/*.menu
 %_sysconfdir/skel/.kde4
 
 %files fvwm-settings
@@ -356,7 +360,7 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \
 
 %files gnome-settings
 %_datadir/themes/*
-/etc/xdg/menus/*
+/etc/gnome/xdg/menus/*
 
 %files slideshow
 /usr/share/install2/slideshow
@@ -371,23 +375,48 @@ cat '/%_datadir/themes/%XdgThemeName/panel-default-setup.entries' > \
 %indexhtmldir/index.css
 %indexhtmldir/images
 %_desktopdir/indexhtml.desktop
+%_datadir/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop
 
 %changelog
-* Sun Apr 07 2013 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt5
-- Remove obsoleted gnome-panel from requires
+* Mon Apr 08 2013 Sergey V Turchin <zerg at altlinux dot org> 6.0.0-alt46
+- fix requires
 
-* Thu Apr 04 2013 Anton V. Boyarshinov <boyarsh@altlinux.ru> 6.0.0-alt4
-- kde3 settings removed
+* Thu Aug 30 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt44.M60P.1
+- built for M60P
 
-* Thu Jun 21 2012 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt3
-- Revert color scheme of kdm window to Oxygen defaults
+* Thu Aug 30 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt45
+- translate installer notes and license titles into russian
 
-* Thu May 17 2012 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt2
-- Fix Plasma theme using
-- Fix splash screen for KDE4
-- Modernize look of web interface of Alterator
+* Tue Aug 21 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt43.M60P.1
+- built for M60P
 
-* Sat May 05 2012 Andrey Cherepanov <cas@altlinux.org> 6.0.0-alt1
-- Build for ALT Linux 6.0 School Master
-- Set firewall icon for ACC
-- Set air-netbook for default Plasma theme
+* Tue Aug 21 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt44
+- update indexhtml css
+
+* Fri Aug 17 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt42.M60P.1
+- built for M60P
+
+* Fri Aug 17 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt43
+- translate indexhtml and indexhtml.desktop titles into russian
+
+* Wed Aug 15 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt41.M60P.1
+- built for M60P
+
+* Wed Aug 15 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt42
+- fix grub terminal-box background color
+
+* Fri Aug 10 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt40.M60P.1
+- built for M60P
+
+* Fri Aug 10 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt41
+- gix license content-type (ALT#27521)
+
+* Tue Jul 31 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt39.M60P.1
+- built for M60P
+
+* Tue Jul 31 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt40
+- fix bootloader menu items color
+- bump release
+
+* Wed Jul 04 2012 Sergey V Turchin <zerg@altlinux.org> 6.0.0-alt1
+- convert from KDesktop branding

components.mk

@@ -1,8 +1,7 @@
 # browser-qt
 
 components/browser-qt/design/bg.png: images/installer.png
-	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)"' $@
+	convert $< -fill '#c62530' -font /usr/share/fonts/ttf/dejavu/DejaVuSansCondensed-Bold.ttf -style Normal -weight Normal -pointsize 20 -draw 'gravity SouthEast rotate -90 text -300,5 "$(STATUS)"' $@
 
 browser-qt:components/browser-qt/design/bg.png
 	install -d $(datadir)/alterator-browser-qt/design
@@ -39,7 +38,9 @@ boot-images:
 #bootsplash
 boot-splash: boot-images
 	mkdir -p $(datadir)/plymouth/themes/$(THEME)
-	cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
+	#cp -al boot-800x600.jpg $(datadir)/plymouth/themes/$(THEME)/grub.jpg
+	#convert -size 800x600 xc:#${MIDDLE_COLOR_HEX} $(datadir)/plymouth/themes/$(THEME)/grub.jpg
+	convert -size 800x600 xc:#306ac4 $(datadir)/plymouth/themes/$(THEME)/grub.jpg
 	cp -al images/background*x*.png $(datadir)/plymouth/themes/$(THEME)/
 	cp -a components/bootsplash/* $(datadir)/plymouth/themes/$(THEME)
 	mv $(datadir)/plymouth/themes/$(THEME)/theme.plymouth $(datadir)/plymouth/themes/$(THEME)/$(THEME).plymouth
@@ -71,3 +72,4 @@ indexhtml: components/indexhtml/index.css
 	done
 	install -Dpm644 images/product-logo.png $(INDEXHTML_DIR)/images/product-logo.png
 	install -Dpm644 components/indexhtml/indexhtml.desktop $(datadir)/applications/indexhtml.desktop
+	install -Dpm755 components/indexhtml/indexhtml.desktop $(datadir)/kde4/apps/kio_desktop/DesktopLinks/indexhtml.desktop

components/ahttpd/images/steps/grub.png

@@ -0,0 +1 @@
+lilo.png

components/bootloader/gfxboot.cfg.in

@@ -48,12 +48,12 @@ bootopt.text.fg=0xffffff
 ; progress bar color
 progress.bar.color=0x@DARK_COLOR_HEX@
 ; menu colors
-menu.normal.bg=0x798491
+menu.normal.bg=0x799191
 menu.normal.fg=@DARK_LABELS_HEX@
 menu.selected.bg=0x@LIGHT_COLOR_HEX@
 menu.selected.fg=@DARK_LABELS_HEX@
 ; window colors
-window.bg=0xd8deed
+window.bg=0xd6eced
 window.fg=0x000000
 window.title.bg=0x@TITLE_COLOR@
 window.title.fg=0x@MIDDLE_LABELS_HEX@

components/browser-qt/theme.qrc

@@ -5,5 +5,6 @@
    <file>design/design.ini</file>
    <file>design/forward.png</file>
    <file>design/backward.png</file>
+   <file>design/logo_48.png</file>
 </qresource>
 </RCC>

components/grub2/theme.txt

@@ -21,12 +21,12 @@
 # THE SOFTWARE.
 
 #general settings
-message-font: "DejaVu Sans Bold 14"
+message-font: "Misc Fixed Bold 13"
 title-text: ""
-message-color: "#000"
-message-bg-color: "#fff"
+message-color: "#000000"
+message-bg-color: "#ffffff"
 desktop-image: "boot.png"
-terminal-font: "DejaVu Sans Regular 12"
+terminal-font: "Misc Fixed Regular 13"
 
 #help bar at the bottom
 + label {
@@ -37,7 +37,7 @@ terminal-font: "DejaVu Sans Regular 12"
 	text = "To boot the selected operating system using default settings, press return. For additional settings, press E"
 	align = "center"
 	font = "DejaVu Sans Regular 10"
-	color = "#000"
+	color = "#000000"
 }
 
 #menu
@@ -46,8 +46,8 @@ terminal-font: "DejaVu Sans Regular 12"
 	width = 58%
 	top = 30%
 	height = 40%
-	item_font = "DejaVu Sans Regular 12"
-	selected_item_font = "DejaVu Sans Bold 14"
+	item_font = "Misc Fixed Bold 13"
+	selected_item_font = "Misc Fixed Bold 13"
 	icon_height = 24
 	icon_width = 24
 	item_height = 26

components/indexhtml/index-en.html.in

@@ -2,7 +2,7 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>@NAME@ @VERSION@ @STATUS@</title>
+<title>@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,7 +16,7 @@
 </div>
 
 <!-- Disto name -->
-<div id="title">@NAME@ @VERSION@ @STATUS@</div>
+<div id="title">@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@</div>
 
 <div id="main">
 <!-- Links columns -->

components/indexhtml/index-ru.html.in

@@ -2,7 +2,7 @@
 <html><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
 
 <!-- Disto name in title -->
-<title>Альт Линукс 6.0 Школьный Мастер</title>
+<title>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</title>
 
 <link href="index.css" rel="stylesheet" type="text/css">
 </head>
@@ -16,7 +16,7 @@
 </div>
 
 <!-- Disto name -->
-<div id="title">Альт Линукс 6.0 Школьный Мастер</div>
+<div id="title">@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</div>
 
 <div id="main">
 <!-- Links columns -->

components/indexhtml/indexhtml.desktop.in

@@ -4,8 +4,8 @@ Type=Application
 Exec=xdg-open /usr/share/doc/indexhtml/index.html
 StartupNotify=false
 Icon=altlinux
-Name=Information about @NAME@ @VERSION@ @STATUS@
+Name=@BRAND_FNAME@ @VERSION@ @NAME@ @STATUS@ - information
 Categories=System;Documentation;
 
 # Translations
-Name[ru]=Сведения о дистрибутиве Школьный Мастер
+Name[ru]=@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@ - сведения

configure.ac

@@ -1,9 +1,9 @@
 AC_INIT( [branding], [0.1], [http://bugzilla.altlinux.ru] )
 
 
-PROGRESS_COLOR=`./fetch_color selectBackground` #MIDDLE_COLOR_DEC
-TITLE_COLOR=`./fetch_color handle`
-INACTIVE_COLOR=`./fetch_color inactiveTitleBtnBg`
+PROGRESS_COLOR=`./fetch_color Colors:Selection::BackgroundNormal` #MIDDLE_COLOR_DEC
+TITLE_COLOR=`./fetch_color WM::activeBackground`
+INACTIVE_COLOR=`./fetch_color WM::inactiveBackground`
 LIGHT_COLOR_HEX=F5F5F5 #new
 MIDDLE_COLOR_HEX=306ac4 #new
 DARK_COLOR_HEX=001056
@@ -19,8 +19,10 @@ DOCDIR=documentation
 
 AC_SUBST(THEME)
 AC_SUBST(NAME)
+AC_SUBST(NAME_RU)
 AC_SUBST(BRAND)
 AC_SUBST(BRAND_FNAME)
+AC_SUBST(BRAND_FNAME_RU)
 AC_SUBST(STATUS)
 AC_SUBST(STATUS_EN)
 AC_SUBST(VERSION)

fetch_color

@@ -1,2 +1,23 @@
 #!/bin/bash
-grep $1 kde3-settings/apps/kdisplay/color-schemes/scheme.kcsrc.in | cut -d= -f 2| tr , ' '| xargs printf "%x%x%x\n"
+
+SECTION=`echo $1| sed 's|::.*||'`
+PARAMETER=`echo $1| sed 's|.*::||'`
+VALUE=
+
+SECTION_FOUND=
+while read LINE
+do
+    if [ -z "$SECTION_FOUND" ] ; then
+	if [ "$LINE" == "[$SECTION]" ]; then
+	    SECTION_FOUND=1
+	else
+	    continue
+	fi
+    fi
+    if echo "$LINE" | grep -q "^${PARAMETER}=" ; then
+	VALUE=`echo "$LINE" | sed 's|.*=||'`
+	break
+    fi
+done < graphics/kde4/kdm-color-scheme.colors
+
+echo "$VALUE"| tr , ' '| xargs printf "%0.2x%0.2x%0.2x\n"

graphics/config

@@ -0,0 +1,4 @@
+BACKGROUND_COLOR=88DCF8
+BACKGROUND_R=136
+BACKGROUND_G=220
+BACKGROUND_B=248

graphics/icons/altlinux.png

@@ -0,0 +1 @@
+altlinux_32x32.png

graphics/icons/large/altlinux.png

@@ -0,0 +1 @@
+../altlinux_48x48.png

graphics/icons/mini/altlinux.png

@@ -0,0 +1 @@
+../altlinux_16x16.png

graphics/kde/splash/pics/Theme.rc

@@ -0,0 +1,3 @@
+[KSplash Theme: Default]
+Engine = Default
+Icons Flashing = true

graphics/kde/splash/pics/locolor/Theme.rc

@@ -0,0 +1,3 @@
+[KSplash Theme: Default]
+Engine = Default
+Icons Flashing = true

kde3-settings/config/clock_panelapplet_iz4k7sqewslydrstu3oc_rc

@@ -1,2 +0,0 @@
-[Digital]
-Background_Color=233,233,233

kde3-settings/config/gtkrc

@@ -1,53 +0,0 @@
-# сделано для KDE, Срд Июн 27 16:12:34 2007
-#
-# Если вы не хотите, чтобы KDE переписал ваши настройки GTK по умолчанию, в разделе
-# Внешний вид и интерфейс -> Цвета Центра управления отключите флажок
-# "Применять цвета к приложениям не из KDE"
-#
-#
-style "default"
-{
-  bg[NORMAL] = { 0.914, 0.914, 0.914 }
-  bg[SELECTED] = { 1.000, 0.867, 0.463 }
-  bg[INSENSITIVE] = { 0.914, 0.914, 0.914 }
-  bg[ACTIVE] = { 0.761, 0.761, 0.761 }
-  bg[PRELIGHT] = { 0.914, 0.914, 0.914 }
-
-  base[NORMAL] = { 1.000, 1.000, 1.000 }
-  base[SELECTED] = { 1.000, 0.867, 0.463 }
-  base[INSENSITIVE] = { 0.914, 0.914, 0.914 }
-  base[ACTIVE] = { 1.000, 0.867, 0.463 }
-  base[PRELIGHT] = { 1.000, 0.867, 0.463 }
-
-  text[NORMAL] = { 0.000, 0.000, 0.000 }
-  text[SELECTED] = { 0.012, 0.012, 0.012 }
-  text[INSENSITIVE] = { 0.761, 0.761, 0.761 }
-  text[ACTIVE] = { 0.012, 0.012, 0.012 }
-  text[PRELIGHT] = { 0.012, 0.012, 0.012 }
-
-  fg[NORMAL] = { 0.000, 0.000, 0.000 }
-  fg[SELECTED] = { 0.012, 0.012, 0.012 }
-  fg[INSENSITIVE] = { 0.761, 0.761, 0.761 }
-  fg[ACTIVE] = { 0.000, 0.000, 0.000 }
-  fg[PRELIGHT] = { 0.000, 0.000, 0.000 }
-}
-
-class "*" style "default"
-
-style "ToolTip"
-{
-  bg[NORMAL] = { 1.000, 1.000, 0.863 }
-  base[NORMAL] = { 1.000, 1.000, 0.863 }
-  text[NORMAL] = { 0.000, 0.000, 0.000 }
-  fg[NORMAL] = { 0.000, 0.000, 0.000 }
-}
-
-widget "gtk-tooltips" style "ToolTip"
-
-style "MenuItem"
-{
-  bg[PRELIGHT] = { 1.000, 0.867, 0.463 }
-}
-
-class "*MenuItem" style "MenuItem"
-

kde3-settings/config/gtkrc-2.0

@@ -1,55 +0,0 @@
-# сделано для KDE, Срд Июн 27 16:12:34 2007
-#
-# Если вы не хотите, чтобы KDE переписал ваши настройки GTK по умолчанию, в разделе
-# Внешний вид и интерфейс -> Цвета Центра управления отключите флажок
-# "Применять цвета к приложениям не из KDE"
-#
-#
-style "default"
-{
-  bg[NORMAL] = { 0.914, 0.914, 0.914 }
-  bg[SELECTED] = { 1.000, 0.867, 0.463 }
-  bg[INSENSITIVE] = { 0.914, 0.914, 0.914 }
-  bg[ACTIVE] = { 0.761, 0.761, 0.761 }
-  bg[PRELIGHT] = { 0.914, 0.914, 0.914 }
-
-  base[NORMAL] = { 1.000, 1.000, 1.000 }
-  base[SELECTED] = { 1.000, 0.867, 0.463 }
-  base[INSENSITIVE] = { 0.914, 0.914, 0.914 }
-  base[ACTIVE] = { 1.000, 0.867, 0.463 }
-  base[PRELIGHT] = { 1.000, 0.867, 0.463 }
-
-  text[NORMAL] = { 0.000, 0.000, 0.000 }
-  text[SELECTED] = { 0.012, 0.012, 0.012 }
-  text[INSENSITIVE] = { 0.761, 0.761, 0.761 }
-  text[ACTIVE] = { 0.012, 0.012, 0.012 }
-  text[PRELIGHT] = { 0.012, 0.012, 0.012 }
-
-  fg[NORMAL] = { 0.000, 0.000, 0.000 }
-  fg[SELECTED] = { 0.012, 0.012, 0.012 }
-  fg[INSENSITIVE] = { 0.761, 0.761, 0.761 }
-  fg[ACTIVE] = { 0.000, 0.000, 0.000 }
-  fg[PRELIGHT] = { 0.000, 0.000, 0.000 }
-}
-
-class "*" style "default"
-
-gtk-alternative-button-order = 1
-
-style "ToolTip"
-{
-  bg[NORMAL] = { 1.000, 1.000, 0.863 }
-  base[NORMAL] = { 1.000, 1.000, 0.863 }
-  text[NORMAL] = { 0.000, 0.000, 0.000 }
-  fg[NORMAL] = { 0.000, 0.000, 0.000 }
-}
-
-widget "gtk-tooltips" style "ToolTip"
-
-style "MenuItem"
-{
-  bg[PRELIGHT] = { 1.000, 0.867, 0.463 }
-}
-
-class "*MenuItem" style "MenuItem"
-

kde3-settings/config/kcmdisplayrc

@@ -1,5 +1,2 @@
-[$Version]
-update_info=kcmdisplayrc.upd:kde3
-
 [X11]
 exportKDEColors=true

kde3-settings/config/kdeglobals.in

@@ -1,6 +1,3 @@
-[$Version]
-update_info=socks.upd:kde3.0/r1,kwin.upd:kde3.2Xinerama,kaccel.upd:kde3.3/r1,kded.upd:kde3.0,klippershortcuts.upd:04112002
-
 [General]
 alternateBackground=236,236,236
 background=231,230,230

kde3-settings/config/konquerorrc

@@ -1,6 +1,3 @@
-[$Version]
-update_info=kfmclient_3_2.upd:kfmclient_3_2
-
 [EmbedSettings]
 embed-image=false
 

kde3-settings/config/kwinrc

@@ -1,6 +1,3 @@
-[$Version]
-update_info=kwin_focus2.upd:kwin_focus2,kwin_focus1.upd:kwin_focus1,kwin3_plugin.upd:kde3.2,kwin.upd:kde3.0r1,kwin.upd:kde3.2Xinerama
-
 [Desktops]
 Name_1=
 Name_2=

kde4-settings/menu/desktop.menu

@@ -1,46 +0,0 @@
-<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
-<Menu>
-   <Menu>
-   <Name>System</Name>
-    <Include>
-        <Filename>kde4-kdebluetooth4.desktop</Filename>
-    </Include>
-   </Menu>
-   <Menu>
-   <Name>Internet</Name>
-     <Exclude>
-	<Filename>bssh.desktop</Filename>
-	<Filename>bvnc.desktop</Filename>
-	<Filename>krb5-ticket-watcher.desktop</Filename>
-	<Filename>kde4-Kppp.desktop</Filename>
-	<Filename>nm-applet.desktop</Filename>
-        <Filename>kde4-kdebluetooth4.desktop</Filename>
-	  <Filename>nxclient.desktop</Filename>
-	  <Filename>nxclient-help.desktop</Filename>
-	  <Filename>nxclient-wizard.desktop</Filename>
-	  <Filename>nxclient-admin.desktop</Filename>
-	  <Filename>kde4-krdc.desktop</Filename>
-      </Exclude>
-      <Menu>
-        <Name>Remote Access</Name>
-	<Directory>desktop-remote-access.directory</Directory>
-        <Include>
-	  <Filename>nxclient.desktop</Filename>
-	  <Filename>nxclient-help.desktop</Filename>
-	  <Filename>nxclient-wizard.desktop</Filename>
-	  <Filename>nxclient-admin.desktop</Filename>
-	  <Filename>kde4-krdc.desktop</Filename>
-        </Include>
-      </Menu>
-      <Menu>
-        <Name>More</Name>
-        <Include>
-	  <Filename>bssh.desktop</Filename>
-	  <Filename>bvnc.desktop</Filename>
-	  <Filename>krb5-ticket-watcher.desktop</Filename>
-	  <Filename>kde4-Kppp.desktop</Filename>
-	<Filename>nm-applet.desktop</Filename>
-        </Include>
-      </Menu>
-   </Menu>
-</Menu>

kde4-settings/menu/shoolmaster.menu

@@ -0,0 +1,38 @@
+<?xml version="1.0"?>
+<!DOCTYPE Menu PUBLIC "-//freedesktop//DTD Menu 1.0//EN" "http://www.freedesktop.org/standards/menu-spec/1.0/menu.dtd">
+<Menu>
+  <Menu>
+    <Name>Settings</Name>
+    <Menu>
+      <Name>HardwareSettings</Name>
+      <Menu>
+        <Name>Printing</Name>
+        <Exclude>
+          <Filename>cups.desktop</Filename>
+        </Exclude>
+      </Menu>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>System</Name>
+    <Exclude>
+      <Filename>cups.desktop</Filename>
+    </Exclude>
+  </Menu>
+  <Menu>
+    <Name>Multimedia</Name>
+    <Menu>
+      <Name>VideoPlayer</Name>
+      <Exclude>
+        <Filename>gnome-mplayer.desktop</Filename>
+      </Exclude>
+    </Menu>
+  </Menu>
+  <Menu>
+    <Name>.hidden</Name>
+    <Include>
+      <Filename>cups.desktop</Filename>
+      <Filename>gnome-mplayer.desktop</Filename>
+    </Include>
+  </Menu>
+</Menu>

notes/index-ru.html.in

@@ -0,0 +1,62 @@
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+
+<head>
+  <title>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</title>
+  <meta http-equiv="Content-Type" content="text/html; charset=utf-8">
+  <link rel="stylesheet" type="text/css" href="index.css">
+</head>
+
+<body>
+
+<div id="top" class="ui-corner-all">
+	<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 ui-corner-all" id="lang">
+ <a href="index-en.html">English</a> |
+ <a href="index-uk.html">Українська</a>
+</div>
+
+<div class="box ui-corner-all">
+  <p>Добро пожаловать в <nobr>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</nobr>. Дистрибутив настроен и готов к работе, можно приступать. Мы надеемся, что наша работа будет для Вас полезной.</p>
+
+  <h2>Документация</h2>
+  <ul>
+    <li><a href="../@DOCDIR@/index.html">Руководство пользователя</a></li>
+  </ul>
+
+  <h2>Информация в Интернете</h2>
+  <ul>
+ <li><a href="http://www.altlinux.ru/">Сайт компании ALT Linux</a></li>
+ <li><a href="http://www.altlinux.org/FAQ">Ответы на часто задаваемые вопросы</a></li>
+ <li><a href="http://www.altlinux.org/">Онлайновая документация</a></li>
+ <li><a href="http://search.altlinux.ru/">Поиск информации по ALT Linux</a></li>
+ <li><a href="http://www.altlinux.ru/online_help/users_mailing_lists.html">Списки рассылки</a></li>
+ <li><a href="http://forum.altlinux.org/">Форум пользователей ALT Linux</a></li>
+ <li><a href="http://support.altlinux.ru/">Техническая поддержка через веб-сайт</a></li>
+  </ul>
+
+  <h2>ALT Linux Team</h2>
+  <p>Этот дистрибутив не появился бы без активного участия ALT Linux Team &mdash; сообщества разработчиков свободного программного обеспечения.</p>
+  <ul>
+    <li><a href="http://www.altlinux.org/">Wiki сообщества</a></li>
+    <li><a href="http://backports.altlinux.org/">Backports</a></li>
+    <li><a href="http://bugs.altlinux.org/">Сообщить об ошибке</a></li>
+  </ul>
+</div>
+
+<p class="footer"><nobr>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</nobr> &copy; ALT Linux, 2011. Все права защищены.<br />
+   Адрес: г. Москва, 5-й Донской проезд, д. 15, стр. 11<br />
+   Телефон/факс: +7 (495) 662-3883
+</p>
+
+</body>
+</html>

notes/license.all.html.in

@@ -1,7 +1,7 @@
 <html>
 <head>
 <title>License agreement</title>
-<meta http-equiv="content-type" value="text/html;charset=utf-8"/>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 

notes/license.ru.html.in

@@ -1,18 +1,18 @@
 <html>
 <head>
 <title>Лицензионный договор</title>
-<meta http-equiv="content-type" value="text/html;charset=utf-8"/>
+<meta http-equiv="content-type" content="text/html; charset=utf-8">
 </head>
 <body>
 
 <h1>Лицензионный договор</h1>
-<h2>на программное обеспечение Альт Линукс 6.0 Школьный Мастер и включенные в него программы для ЭВМ</h2>
+<h2>на программное обеспечение @BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@ и включенные в него программы для ЭВМ</h2>
 
 <p><b>1. Сведения о договоре</b></p>
 <p>1.1 Участники договора</p>
 
 <p>Настоящий лицензионный договор заключается между ООО «Альт Линукс», обладателем прав на программное обеспечение 
-<strong>Альт Линукс 6.0 Школьный Мастер</strong> 
+<strong>@BRAND_FNAME_RU@ @VERSION@ @NAME_RU@ @STATUS@</strong> 
 (далее - ДИСТРИБУТИВ), и Вами, владельцем экземпляра ДИСТРИБУТИВА.</p>
 
 <p>1.2 Предмет договора</p>

notes/release-notes.all.html.in

@@ -4,7 +4,9 @@
     <meta http-equiv="content-type" value="text/html;charset=utf-8"/>
 </head>
 <body>
-    <H2>Thank you for choosing ALT Linux 6.0 School Master!</H2>
+    <center><p>
+        Thank you for choosing @BRAND_FNAME@ @VERSION@ @NAME@!
+    </p></center>
     <p>
     You can learn more about features of this product at our official site:
     <a href="http://www.altlinux.ru">www.altlinux.ru</a>.

notes/release-notes.ru.html.in

@@ -5,7 +5,7 @@
 	<TITLE></TITLE>
 </HEAD>
 <BODY>
-    <H2>Спасибо Вам за выбор Альт Линукс 6.0 Школьный Мастер!</H2>
+    <H2>Спасибо Вам за выбор @BRAND_FNAME_RU@ @VERSION@ @NAME_RU@!</H2>
     <p>
     На нашем официальном сайте
     <a href="http://www.altlinux.ru">www.altlinux.ru</a> вы можете
@@ -13,7 +13,7 @@
     </p>
     <p>
     <em>Совет</em>: Обязательно посетите наш фирменный интернет-магазин
-    <a href="http://shop.altlinux.ru">shop.altlinux.ru</a>. В нем
+    <a href="http://shop.altlinux.ru">shop.altlinux.ru</a>. В нём
     представлен весь ассортимент продуктов и услуг ALT Linux, много
     полезного, интересного и даже эксклюзивного для специалистов,
     пользователей и ценителей системы.