minor indentation a various updates patch from Luca Ferretti

2003-10-20  Jakub Steiner <jimmac@ximian.com>

minor indentation a various updates patch
from Luca Ferretti <elle.uca@infinito.it>:

* use GNOME (not Gnome) in index.theme
* add missed 32x32/stock/object to index.theme
* remove from scalable/emblems/Makefile.am replaced emblems
* add some missed icon.in files in po/POTFILES.in
* update entry for replaced emblems in POTFILES.in

5 files changed, 79 insertions, 71 deletions

diff --git a/48x48/emblems/Makefile.am b/48x48/emblems/Makefile.am
index 3567394a7..c156a7842 100644
--- a/48x48/emblems/Makefile.am
+++ b/48x48/emblems/Makefile.am
@@ -9,63 +9,63 @@ icon_in_files =				\
 	emblem-bin.icon.in		\
 	emblem-cool.icon.in		\
 	emblem-camera.icon.in		\
-   emblem-certified.icon.in \
+	emblem-certified.icon.in 	\
 	emblem-danger.icon.in		\
 	emblem-documents.icon.in	\
-	emblem-favorite.icon.in	\
-   emblem-generic.icon.in \
+	emblem-favorite.icon.in		\
+	emblem-generic.icon.in 		\
 	emblem-handshake.icon.in	\
-   emblem-important.icon.in \
+	emblem-important.icon.in 	\
 	emblem-mail.icon.in		\
-	emblem-marketing.icon.in		\
+	emblem-marketing.icon.in	\
 	emblem-money.icon.in		\
 	emblem-multimedia.icon.in	\
-	emblem-ohno.icon.in	\
-   emblem-OK.icon.in \
+	emblem-ohno.icon.in		\
+	emblem-OK.icon.in 		\
 	emblem-package.icon.in		\
 	emblem-people.icon.in		\
 	emblem-pictures.icon.in		\
 	emblem-plan.icon.in		\
-	emblem-presentation.icon.in		\
+	emblem-presentation.icon.in	\
 	emblem-sales.icon.in		\
 	emblem-sound.icon.in		\
-   emblem-special.icon.in \
+	emblem-special.icon.in 		\
 	emblem-web.icon.in		\
 	$(NULL)
 
 icon_DATA =\
-	emblem-art.png \
-	emblem-bin.png \
-	emblem-cool.png \
-	emblem-camera.png \
-   emblem-certified.png \
-	emblem-danger.png \
-	emblem-desktop.png \
-	emblem-documents.png \
-	emblem-favorite.png \
-   emblem-generic.png \
-	emblem-handshake.png \
-   emblem-important.png \
-	emblem-mail.png \
-	emblem-marketing.png \
-	emblem-money.png \
-	emblem-multimedia.png \
-	emblem-note.png \
-	emblem-noread.png \
-	emblem-nowrite.png \
-	emblem-ohno.png \
-   emblem-OK.png \
-	emblem-package.png \
-	emblem-people.png \
-	emblem-pictures.png \
-	emblem-plan.png \
-	emblem-presentation.png \
-	emblem-sales.png \
-	emblem-sound.png \
-   emblem-special.png \
-	emblem-symbolic-link.png \
-	emblem-trash.png \
-	emblem-web.png \
+	emblem-art.png			\
+	emblem-bin.png			\
+	emblem-cool.png			\
+	emblem-camera.png		\
+	emblem-certified.png		\
+	emblem-danger.png		\
+	emblem-desktop.png		\
+	emblem-documents.png		\
+	emblem-favorite.png		\
+	emblem-generic.png		\
+	emblem-handshake.png		\
+	emblem-important.png 		\
+	emblem-mail.png			\
+	emblem-marketing.png		\
+	emblem-money.png		\
+	emblem-multimedia.png		\
+	emblem-note.png			\
+	emblem-noread.png		\
+	emblem-nowrite.png		\
+	emblem-ohno.png			\
+	emblem-OK.png			\
+	emblem-package.png		\
+	emblem-people.png		\
+	emblem-pictures.png		\
+	emblem-plan.png			\
+	emblem-presentation.png		\
+	emblem-sales.png		\
+	emblem-sound.png		\
+	emblem-special.png		\
+	emblem-symbolic-link.png	\
+	emblem-trash.png		\
+	emblem-web.png			\
 	$(icon_in_files:.icon.in=.icon)
 	$(NULL)
 
diff --git a/ChangeLog b/ChangeLog
index c4de04336..cb8a5c365 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2003-10-20  Jakub Steiner <jimmac@ximian.com>
+
+	minor indentation a various updates patch 
+	from Luca Ferretti <elle.uca@infinito.it>:
+	
+	* use GNOME (not Gnome) in index.theme
+	* add missed 32x32/stock/object to index.theme
+	* remove from scalable/emblems/Makefile.am replaced emblems
+	* add some missed icon.in files in po/POTFILES.in 
+	* update entry for replaced emblems in POTFILES.in
+
 2003-10-17  Jakub Steiner <jimmac@ximian.com>
 
 	* index.theme.in
diff --git a/index.theme.in b/index.theme.in
index 4c7391c2f..0208d3a46 100755
--- a/index.theme.in
+++ b/index.theme.in
@@ -1,7 +1,7 @@
 [Icon Theme]
-_Name=Gnome
-_Comment=Default Gnome Theme
-Directories=192x192/apps,192x192/devices,192x192/emblems,192x192/filesystems,192x192/mimetypes,96x96/apps,96x96/devices,96x96/emblems,96x96/filesystems,96x96/mimetypes,72x72/apps,72x72/devices,72x72/emblems,72x72/filesystems,72x72/mimetypes,48x48/apps,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,36x36/apps,36x36/devices,36x36/emblems,36x36/filesystems,36x36/mimetypes,36x36/stock/document,36x36/stock/generic,32x32/apps,32x32/filesystems,32x32/mimetypes,32x32/stock/code,32x32/stock/chart,32x32/stock/data,32x32/stock/document,32x32/stock/generic,32x32/stock/io,32x32/stock/media,32x32/stock/net,24x24/apps,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/apps,16x16/filesystems,16x16/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,12x12/apps,12x12/devices,12x12/emblems,12x12/filesystems,12x12/mimetypes,scalable/apps,scalable/devices,scalable/emblems,scalable/filesystems,scalable/mimetypes
+_Name=GNOME
+_Comment=Default GNOME Theme
+Directories=192x192/apps,192x192/devices,192x192/emblems,192x192/filesystems,192x192/mimetypes,96x96/apps,96x96/devices,96x96/emblems,96x96/filesystems,96x96/mimetypes,72x72/apps,72x72/devices,72x72/emblems,72x72/filesystems,72x72/mimetypes,48x48/apps,48x48/devices,48x48/emblems,48x48/filesystems,48x48/mimetypes,48x48/stock/code,48x48/stock/document,48x48/stock/generic,48x48/stock/io,48x48/stock/net,36x36/apps,36x36/devices,36x36/emblems,36x36/filesystems,36x36/mimetypes,36x36/stock/document,36x36/stock/generic,32x32/apps,32x32/filesystems,32x32/mimetypes,32x32/stock/code,32x32/stock/chart,32x32/stock/data,32x32/stock/document,32x32/stock/generic,32x32/stock/io,32x32/stock/media,32x32/stock/net,32x32/stock/object,24x24/apps,24x24/devices,24x24/emblems,24x24/filesystems,24x24/mimetypes,24x24/stock/chart,24x24/stock/code,24x24/stock/data,24x24/stock/document,24x24/stock/form,24x24/stock/generic,24x24/stock/image,24x24/stock/io,24x24/stock/media,24x24/stock/navigation,24x24/stock/net,24x24/stock/object,24x24/stock/table,24x24/stock/text,16x16/apps,16x16/filesystems,16x16/mimetypes,16x16/stock/chart,16x16/stock/code,16x16/stock/code,16x16/stock/data,16x16/stock/document,16x16/stock/form,16x16/stock/generic,16x16/stock/image,16x16/stock/io,16x16/stock/media,16x16/stock/navigation,16x16/stock/net,16x16/stock/object,16x16/stock/table,16x16/stock/text,12x12/apps,12x12/devices,12x12/emblems,12x12/filesystems,12x12/mimetypes,scalable/apps,scalable/devices,scalable/emblems,scalable/filesystems,scalable/mimetypes
 
 [192x192/apps]
 Size=192
@@ -218,6 +218,11 @@ Size=32
 Context=Stock
 Type=Scalable
 
+[32x32/stock/object]
+Size=32
+Context=Stock
+Type=Scalable
+
 [24x24/apps]
 Size=24
 Context=Applications
diff --git a/po/POTFILES.in b/po/POTFILES.in
index d4e5924f9..2da454d80 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -2,27 +2,31 @@
 [type: gettext/ini] 48x48/emblems/emblem-art.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-bin.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-camera.icon.in
+[type: gettext/ini] 48x48/emblems/emblem-certified.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-cool.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-danger.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-documents.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-favorite.icon.in
+[type: gettext/ini] 48x48/emblems/emblem-generic.icon.in
+[type: gettext/ini] 48x48/emblems/emblem-handshake.icon.in
+[type: gettext/ini] 48x48/emblems/emblem-important.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-mail.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-marketing.icon.in
+[type: gettext/ini] 48x48/emblems/emblem-money.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-multimedia.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-ohno.icon.in
+[type: gettext/ini] 48x48/emblems/emblem-OK.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-package.icon.in
+[type: gettext/ini] 48x48/emblems/emblem-people.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-pictures.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-plan.icon.in
+[type: gettext/ini] 48x48/emblems/emblem-presentation.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-sales.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-sound.icon.in
+[type: gettext/ini] 48x48/emblems/emblem-special.icon.in
 [type: gettext/ini] 48x48/emblems/emblem-web.icon.in
-[type: gettext/ini] scalable/emblems/emblem-certified.icon.in
 [type: gettext/ini] scalable/emblems/emblem-distinguished.icon.in
 [type: gettext/ini] scalable/emblems/emblem-draft.icon.in
-[type: gettext/ini] scalable/emblems/emblem-generic.icon.in
-[type: gettext/ini] scalable/emblems/emblem-important.icon.in
 [type: gettext/ini] scalable/emblems/emblem-new.icon.in
-[type: gettext/ini] scalable/emblems/emblem-OK.icon.in
 [type: gettext/ini] scalable/emblems/emblem-personal.icon.in
-[type: gettext/ini] scalable/emblems/emblem-special.icon.in
 [type: gettext/ini] scalable/emblems/emblem-urgent.icon.in
diff --git a/scalable/emblems/Makefile.am b/scalable/emblems/Makefile.am
index 532d2635f..f86e60afa 100644
--- a/scalable/emblems/Makefile.am
+++ b/scalable/emblems/Makefile.am
@@ -5,31 +5,19 @@ category=emblems
 icondir = $(datadir)/icons/gnome/$(iconsize)/$(category)
 
 icon_in_files =\
-	emblem-certified.icon.in \
-	emblem-distinguished.icon.in \
-	emblem-draft.icon.in \
-	emblem-generic.icon.in \
-	emblem-important.icon.in \
-	emblem-new.icon.in \
-	emblem-OK.icon.in \
-	emblem-personal.icon.in \
-	emblem-special.icon.in \
-	emblem-urgent.icon.in \
+	emblem-distinguished.icon.in	\
+	emblem-draft.icon.in		\
+	emblem-new.icon.in		\
+	emblem-personal.icon.in		\
+	emblem-urgent.icon.in		\
 	$(NULL)
 
 icon_DATA =\
-	emblem-certified.svg \
-	emblem-distinguished.svg \
-	emblem-draft.svg \
-	emblem-generic.svg \
-	emblem-important.svg \
-	emblem-new.svg \
-	emblem-noread.svg \
-	emblem-nowrite.svg \
-	emblem-OK.svg \
-	emblem-personal.svg \
-	emblem-special.svg \
-	emblem-urgent.svg \
+	emblem-distinguished.svg	\
+	emblem-draft.svg		\
+	emblem-new.svg			\
+	emblem-personal.svg		\
+	emblem-urgent.svg		\
 	$(icon_in_files:.icon.in=.icon)
 	$(NULL)