imported patch oi-branding-cmd-slim-install oi_151a
authorAlasdair Lumsden <al@everycity.co.uk>
Tue, 16 Aug 2011 20:54:07 +0000
branchoi_151a
changeset 1399 6553f26335bf
parent 1398 3cd5b2156d4c
child 1400 6c54a8b98066
imported patch oi-branding-cmd-slim-install
usr/src/cmd/slim-install/license/show-license
usr/src/cmd/slim-install/user/jack/Makefile
usr/src/cmd/slim-install/user/jack/getting_started.desktop
usr/src/cmd/slim-install/user/jack/install_openindiana.desktop
usr/src/cmd/slim-install/user/jack/install_opensolaris.desktop
--- a/usr/src/cmd/slim-install/license/show-license	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/slim-install/license/show-license	Tue Aug 16 20:54:07 2011 +0000
@@ -28,4 +28,4 @@
 
 # We run zenity this way rather so that we can pull the license text from
 # stdin to work around a problem with zenity dealing with non-UTF-8 characters.
-zenity --text-info --title="Oracle Solaris License" --width 700 --height 700 <${license}
+zenity --text-info --title="OpenIndiana License" --width 700 --height 700 <${license}
--- a/usr/src/cmd/slim-install/user/jack/Makefile	Tue Aug 16 20:54:07 2011 +0000
+++ b/usr/src/cmd/slim-install/user/jack/Makefile	Tue Aug 16 20:54:07 2011 +0000
@@ -24,8 +24,8 @@
 
 JACKCONFIGAUTOFILESRC = iotrace.desktop ddu_silent.desktop
 JACKFILESRC644 = xorg.conf.vesa
-JACKDESKTOPFILESRC = 	install_opensolaris.desktop ddu.desktop \
-			getting_started.desktop .os-icons-installed gparted.desktop
+JACKDESKTOPFILESRC = 	install_openindiana.desktop ddu.desktop \
+			.os-icons-installed gparted.desktop
 JACKDOTFILESRC = Xclients bashrc profile xscreensaver dmrc
 
 include $(SRC)/cmd/slim-install/Makefile.slim
--- a/usr/src/cmd/slim-install/user/jack/getting_started.desktop	Tue Aug 16 20:54:07 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Getting Started With Oracle Solaris
-Name[de]=Erste Schritte mit Oracle Solaris
-Name[es]=Guía de inicio de Oracle Solaris
-Name[fr]=Démarrage d'Oracle Solaris
-Name[he]=מתחילים עם Oracle Solaris
-Name[it]=Guida Introduttiva Oracle Solaris
-Name[ja]=Oracle Solaris 入門
-Name[ko]=Oracle Solaris 시작
-Name[pt_BR]=Introdução ao Oracle Solaris
-Name[ru]=Начало работы в ОС Oracle Solaris
-Name[sk]=Začíname so systémom Oracle Solaris
-Name[sv]=Komma igång med Oracle Solaris
-Name[zh_CN]=Oracle Solaris 入门
-Name[zh_HK]=Oracle Solaris 使用入門
-Name[zh_TW]=Oracle Solaris 使用入門
-Type=Application
-Terminal=false
-Exec=/usr/bin/firefox file:///usr/share/doc/getting-started/html/index.html
-StartupNotify=true
-Icon=/usr/share/icons/nimbus/48x48/apps/firefox-icon.png
-GenericName=Getting Started With Oracle Solaris
-GenericName[de]=Erste Schritte mit Oracle Solaris
-GenericName[es]=Guía de inicio de Oracle Solaris
-GenericName[fr]=Démarrage d'Oracle Solaris
-GenericName[he]=מתחילים עם Oracle Solaris
-GenericName[it]=Guida Introduttiva Oracle Solaris
-GenericName[ja]=Oracle Solaris 入門
-GenericName[ko]=Oracle Solaris 시작
-GenericName[pt_BR]=Introdução ao Oracle Solaris
-GenericName[ru]=Начало работы в ОС Oracle Solaris
-GenericName[sk]=Začíname so systémom Oracle Solaris
-GenericName[sv]=Komma igång med Oracle Solaris
-GenericName[zh_CN]=Oracle Solaris 入门
-GenericName[zh_HK]=Oracle Solaris 使用入門
-GenericName[zh_TW]=Oracle Solaris 使用入門
-Comment=
-Categories=Applications;System
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/usr/src/cmd/slim-install/user/jack/install_openindiana.desktop	Tue Aug 16 20:54:07 2011 +0000
@@ -0,0 +1,39 @@
+[Desktop Entry]
+Encoding=UTF-8
+Name=Install OpenIndiana
+Name[de]=Installieren von OpenIndiana
+Name[es]=Instalar OpenIndiana
+Name[fr]=Installer OpenIndiana
+Name[it]=Installa OpenIndiana
+Name[he]=התקן את OpenIndiana
+Name[ja]=OpenIndiana をインストールする
+Name[ko]=OpenIndiana 설치
+Name[pt_BR]=Instalar OpenIndiana
+Name[ru]=Установить OpenIndiana
+Name[sk]=Inštalovať OpenIndiana
+Name[sv]=Installera OpenIndiana
+Name[zh_CN]=安装 OpenIndiana
+Name[zh_HK]=安裝 OpenIndiana
+Name[zh_TW]=安裝 OpenIndiana
+Type=Application
+Terminal=false
+Exec=/usr/bin/pfexec /usr/bin/gui-install
+StartupNotify=true
+Icon=system-software-install
+GenericName=Install OpenIndiana to disk
+GenericName[de]=Installieren von OpenIndiana auf Datenträger
+GenericName[es]=Instalar OpenIndiana en disco
+GenericName[fr]=Installer OpenIndiana sur le disque
+GenericName[he]=התקן את OpenIndiana לדיסק
+GenericName[it]=Installa OpenIndiana sul disco
+GenericName[ja]=OpenIndiana をディスクにインストールする
+GenericName[ko]=OpenIndiana를 디스크에 설치
+GenericName[pt_BR]=Instalar OpenIndiana no disco
+GenericName[ru]=Установить OpenIndiana на диск
+GenericName[sk]=Inštalovať OpenIndiana na disk
+GenericName[sv]=Installera OpenIndiana på disk
+GenericName[zh_CN]=将 OpenIndiana 安装到磁盘
+GenericName[zh_HK]=將 OpenIndiana 安裝至磁碟
+GenericName[zh_TW]=將 OpenIndiana 安裝至磁碟
+Comment=
+Categories=Applications;System
--- a/usr/src/cmd/slim-install/user/jack/install_opensolaris.desktop	Tue Aug 16 20:54:07 2011 +0000
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,39 +0,0 @@
-[Desktop Entry]
-Encoding=UTF-8
-Name=Install Oracle Solaris
-Name[de]=Installieren von Oracle Solaris
-Name[es]=Instalar Oracle Solaris
-Name[fr]=Installer Oracle Solaris
-Name[it]=Installa Oracle Solaris
-Name[he]=התקן את Oracle Solaris
-Name[ja]=Oracle Solaris をインストールする
-Name[ko]=Oracle Solaris 설치
-Name[pt_BR]=Instalar Oracle Solaris
-Name[ru]=Установить Oracle Solaris
-Name[sk]=Inštalovať Oracle Solaris
-Name[sv]=Installera Oracle Solaris
-Name[zh_CN]=安装 Oracle Solaris
-Name[zh_HK]=安裝 Oracle Solaris
-Name[zh_TW]=安裝 Oracle Solaris
-Type=Application
-Terminal=false
-Exec=/usr/bin/pfexec /usr/bin/gui-install
-StartupNotify=true
-Icon=system-software-install
-GenericName=Install Oracle Solaris to disk
-GenericName[de]=Installieren von Oracle Solaris auf Datenträger
-GenericName[es]=Instalar Oracle Solaris en disco
-GenericName[fr]=Installer Oracle Solaris sur le disque
-GenericName[he]=התקן את Oracle Solaris לדיסק
-GenericName[it]=Installa Oracle Solaris sul disco
-GenericName[ja]=Oracle Solaris をディスクにインストールする
-GenericName[ko]=Oracle Solaris를 디스크에 설치
-GenericName[pt_BR]=Instalar Oracle Solaris no disco
-GenericName[ru]=Установить Oracle Solaris на диск
-GenericName[sk]=Inštalovať Oracle Solaris na disk
-GenericName[sv]=Installera Oracle Solaris på disk
-GenericName[zh_CN]=将 Oracle Solaris 安装到磁盘
-GenericName[zh_HK]=將 Oracle Solaris 安裝至磁碟
-GenericName[zh_TW]=將 Oracle Solaris 安裝至磁碟
-Comment=
-Categories=Applications;System