Merge branch 'master' of https://git.code.sf.net/p/cdesktopenv/code

cde/databases/CDE-MIN.udb

@@ -175,6 +175,29 @@
 copyright
 { default
 	install_target = /usr/dt/copyright
+	mode = 0644
+}
+
+#
+#>>----------------------------- 
+# the COPYING file
+#<<----------------------------- 
+#
+COPYING
+{ default
+	install_target = /usr/dt/COPYING
+	mode = 0644
+}
+
+#
+#>>----------------------------- 
+# the CONTRIBUTORS file
+#<<----------------------------- 
+#
+CONTRIBUTORS
+{ default
+	install_target = /usr/dt/CONTRIBUTORS
+	mode = 0644
 }
 
 #

cde/programs/dtsession/sys.resources.src

@@ -117,6 +117,14 @@ Dtfile*dirHeight:       400
 XCOMM endif
 XCOMM endif
 
+!#################################################################
+!#
+!#  Default ColorUse resource
+!#
+!#################################################################
+
+*ColorUse:        HIGH_COLOR
+
 !#################################################################
 !#
 !#  Motif resources

cde/programs/dtwm/Dtwm.defs.src

@@ -186,6 +186,8 @@ Dtwm*VersionDialog_popup*columns:	%|nls-6-40^columns|
 !####
 #ifdef __osf__
 Dtwm*Mail*fileName:	     			/usr/spool/mail/$LOGNAME
+#elif defined(linux)
+Dtwm*Mail*fileName:	     			/var/mail/$LOGNAME
 #else
 !# Dtwm*Mail*fileName:	     			/usr/mail/$LOGNAME
 #endif

cde/programs/localized/C/config/sys.dtwmrc.tmsg

@@ -135,6 +135,10 @@ $ *--------------------------------------------------------------------------*
     "Minimize"	_n	Alt<Key>F9	f.minimize\n\
     "Maximize"	_x	Alt<Key>F10	f.maximize\n\
     "Lower"	_L	Alt<Key>F3	f.lower\n\
+     no-label						f.separator\n\
+    "Occupy Workspace..."	_O			f.workspace_presence\n\
+    "Occupy All Workspaces"	_A			f.occupy_all\n\
+    "Unoccupy Workspace"	_U			f.remove\n\
     no-label				f.separator\n\
     "Close"	_C	Alt<Key>F4	f.kill
 $ *

cde/programs/localized/de_DE.ISO8859-1/config/sys.dtwmrc.tmsg

@@ -142,6 +142,10 @@ $ *--------------------------------------------------------------------------*
     \"Symbolgröße\"\t_S\tAlt<Key>F9\tf.minimize\n\
     \"Maximale Größe\"\t_M\tAlt<Key>F10\tf.maximize\n\
     \"Nach hinten\"\t_u\tAlt<Key>F3\tf.lower\n\
+     no-label\t\t\t\t\t\tf.separator\n\
+    \"Arbeitsbereich belegen...\"\t_b\t\t\tf.workspace_presence\n\
+    \"Alle Arbeitsbereiche belegen\"\t_A\t\t\tf.occupy_all\n\
+    \"Aus Arbeitsbereich entfernen\"\t_e\t\t\tf.remove\n\
     no-label\t\t\t\tf.separator\n\
     \"Schließen\"\t_c\tAlt<Key>F4\tf.kill"
 $ *  

cde/programs/localized/es_ES.ISO8859-1/config/sys.dtwmrc.tmsg

@@ -142,6 +142,10 @@ $ *--------------------------------------------------------------------------*
     \"Minimizar\"\t_n\tAlt<Key>F9\tf.minimize\n\
     \"Maximizar\"\t_x\tAlt<Key>F10\tf.maximize\n\
     \"Bajar\"\t_P\tAlt<Key>F3\tf.lower\n\
+     no-label\t\t\t\t\t\tf.separator\n\
+    \"Ocupar Espacio de trabajo...\"\t_O\t\t\tf.workspace_presence\n\
+    \"Ocupar todos los Espacios de Trabajo\"\t_T\t\t\tf.occupy_all\n\
+    \"Desocupar Espacio de trabajo\"\t_u\t\t\tf.remove\n\
     no-label\t\t\t\tf.separator\n\
     \"Cerrar\"\t_C\tAlt<Key>F4\tf.kill"
 $ *  

cde/programs/localized/fr_FR.ISO8859-1/config/sys.dtwmrc.tmsg

@@ -142,6 +142,10 @@ $ *--------------------------------------------------------------------------*
     \"Réduire\"\t_u\tAlt<Key>F9\tf.minimize\n\
     \"Agrandir\"\t_A\tAlt<Key>F10\tf.maximize\n\
     \"Derrière\"\t_r\tAlt<Key>F3\tf.lower\n\
+     no-label\t\t\t\t\t\tf.separator\n\
+    \"Occuper l'espace de travail...\"\t_O\t\t\tf.workspace_presence\n\
+    \"Occuper tous les espaces de travail\"\t_l\t\t\tf.occupy_all\n\
+    \"Libérer l'espace de travail\"\t_v\t\t\tf.remove\n\
     no-label\t\t\t\tf.separator\n\
     \"Fermer\"\t_F\tAlt<Key>F4\tf.kill"
 $ *  

cde/programs/localized/it_IT.ISO8859-1/config/sys.dtwmrc.tmsg

@@ -135,6 +135,10 @@ $ *--------------------------------------------------------------------------*
     "Ridurre a icona"	_i	Alt<Key>F9	f.minimize\n\
     "Ingrandire"	_g	Alt<Key>F10	f.maximize\n\
     "In fondo"		_f	Alt<Key>F3	f.lower\n\
+     no-label						f.separator\n\
+    "Occupare spazio di lavoro..."	_O			f.workspace_presence\n\
+    "Occupare tutti gli spazi di lavoro"	_t			f.occupy_all\n\
+    "Eliminare dallo spazio di lavoro"		_l			f.remove\n\
     no-label				f.separator\n\
     "Chiudere"		_C	Alt<Key>F4	f.kill
 $ *

cde/programs/localized/templates/app-defaults.tmpl

@@ -8,6 +8,13 @@ SHELL=/bin/ksh
 .NO_PARALLEL:
 #endif
 
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
+DTINFO=
+#else
+DTINFO="Dtinfo"
+#endif
+
 OBJS =  \
         Dthelpview  \
         Dtimsstart  \
@@ -26,7 +33,7 @@ OBJS =  \
 	Dtterm \
 	Dtmail \
 	Dtbuilder \
-	Dtinfo \
+	$(DTINFO) \
 	Dtudcfonted \
         Dt
 
@@ -49,7 +56,10 @@ LinkFile(Dtcm.nls,$(CDESRC)/dtcm/dtcm/Dtcm.ad)
 LinkFile(Dtterm.nls,$(CDESRC)/dtterm/Dtterm.ad)
 LinkFile(Dtmail.nls,$(CDESRC)/dtmail/dtmail/Dtmail)
 LinkFile(Dtbuilder.nls,$(CDESRC)/dtappbuilder/src/ab/Dtbuilder.ad)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
 LinkFile(Dtinfo.nls,$(CDESRC)/dtinfo/dtinfo/src/Dtinfo)
+#endif
 LinkFile(Dtudcfonted.nls,$(CDESRC)/dtudcfonted/resource/Dtudcfonted)
 LinkFile(Dt.nls,$(DTSVCSRC)/DtUtil2/Dt.ad)
 
@@ -70,7 +80,10 @@ DtstyleDescRule(Dtcm,Dtcm)
 DtstyleDescRule(Dtterm,Dtterm)
 DtstyleDescRule(Dtmail,Dtmail)
 DtstyleDescRule(Dtbuilder,Dtbuilder)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
 DtstyleDescRule(Dtinfo,Dtinfo)
+#endif
 DtstyleDescRule(Dtudcfonted,Dtudcfonted)
 DtstyleDescRule(Dt,Dt)
 

cde/programs/localized/templates/msg.C.tmpl

@@ -8,6 +8,14 @@ SHELL=/bin/ksh
 .NO_PARALLEL:
 #endif
 
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
+DTINFOCATS=
+#else
+DTINFOCATS="dtinfo.cat dtinfo_start.cat"
+#endif
+
+
 OBJS= \
       Xm.cat		\
       Mrm.cat		\
@@ -34,8 +42,7 @@ OBJS= \
       dthelpprint.cat	\
       dticon.cat	\
       dtimsstart.cat	\
-      dtinfo.cat	\
+      $(DTINFOCATS)	\
-      dtinfo_start.cat	\
       dtksh.cat		\
       dtlogin.cat	\
       dtlp.cat		\
@@ -86,8 +93,11 @@ LinkFile(dthelpgen.msg,$(CDESRC)/dthelp/dthelpgen/dthelpgen.msg)
 LinkFile(dthelpprint.msg,$(CDESRC)/dthelp/dthelpprint/dthelpprint.msg)
 LinkFile(dticon.msg,$(CDESRC)/dticon/dticon.msg)
 LinkFile(dtimsstart.msg,$(CDESRC)/dtimsstart/dtimsstart.msg)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
 LinkFile(dtinfo.msg,$(CDESRC)/dtinfo/dtinfo/src/dtinfo.msg.updated)
 LinkFile(dtinfo_start.msg,$(CDESRC)/dtinfo/clients/dtinfo_start/dtinfo_start.msg)
+#endif
 LinkFile(dtksh.msg,$(CDESRC)/dtksh/dtksh.msg)
 LinkFile(dtlogin.msg,$(CDESRC)/dtlogin/dtlogin.msg)
 LinkFile(dtlp.msg,$(CDESRC)/dtprintegrate/dtlp.msg)

cde/programs/localized/templates/types.tmpl

@@ -4,6 +4,13 @@ XCOMM $TOG: types.tmpl /main/9 1998/08/05 18:05:45 mgreess $
 SHELL=/bin/ksh
 #endif
 
+#if defined(LinuxArchitecture) || defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
+DTINFODT=
+#else
+DTINFODT="dtinfo.dt"
+#endif
+
 OBJS1 =  \
 	autoStart.dt \
 	user-prefs.dt  \
@@ -14,7 +21,7 @@ OBJS1 =  \
 	dtappman.dt  \
 	dtfile.dt  \
 	dtims.dt \
-	dtinfo.dt  \
+	$(DTINFODT) \
 	dtpad.dt  \
 	xclients.dt  \
 	dthelp.dt  \
@@ -56,7 +63,10 @@ LinkFile(datatypes.dt.nls,$(CDESRC)/types/datatypes.dt)
 LinkFile(dtappman.dt.nls,$(CDESRC)/types/dtappman.dt)
 LinkFile(dtfile.dt.nls,$(CDESRC)/types/dtfile.dt)
 LinkFile(dtims.dt.nls,$(CDESRC)/types/dtims.dt)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
 LinkFile(dtinfo.dt.nls,$(CDESRC)/types/dtinfo.dt)
+#endif
 LinkFile(dtpad.dt.nls,$(CDESRC)/types/dtpad.dt)
 LinkFile(xclients.dt.nls,$(CDESRC)/types/xclients.dt)
 LinkFile(dthelp.dt.nls,$(CDESRC)/types/dthelp.dt)
@@ -89,7 +99,10 @@ LinkFile(datatypes.dt.tmsg,_common.dt.tmsg)
 LinkFile(dtappman.dt.tmsg,_common.dt.tmsg)
 LinkFile(dtfile.dt.tmsg,_common.dt.tmsg)
 LinkFile(dtims.dt.tmsg,_common.dt.tmsg)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
 LinkFile(dtinfo.dt.tmsg,_common.dt.tmsg)
+#endif
 LinkFile(dtpad.dt.tmsg,_common.dt.tmsg)
 LinkFile(xclients.dt.tmsg,_common.dt.tmsg)
 LinkFile(dthelp.dt.tmsg,_common.dt.tmsg)
@@ -121,7 +134,10 @@ DtstyleDescRule(datatypes.dt,datatypes.dt)
 DtstyleDescRule(dtappman.dt,dtappman.dt)
 DtstyleDescRule(dtfile.dt,dtfile.dt)
 DtstyleDescRule(dtims.dt,dtims.dt)
+#if !defined(LinuxArchitecture) && !defined(FreeBSDArchitecture)
+XCOMM no dtinfo for linux/fbsd
 DtstyleDescRule(dtinfo.dt,dtinfo.dt)
+#endif
 DtstyleDescRule(dtpad.dt,dtpad.dt)
 DtstyleDescRule(xclients.dt,xclients.dt)
 DtstyleDescRule(dthelp.dt,dthelp.dt)